mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
21bb02d08f
We already have a ":" after the user name to denote the start of the description. The current usage of quotes around the description is problematic as the truncation to 80 chars is likely to drop the closing quote. This may confuse syntax coloration in some editors.
74 lines
1.8 KiB
Perl
74 lines
1.8 KiB
Perl
$ hg init
|
|
$ echo "nothing" > a
|
|
$ hg add a
|
|
$ hg commit -m ancestor
|
|
$ echo "something" > a
|
|
$ hg commit -m branch1
|
|
$ hg co 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo "something else" > a
|
|
$ hg commit -m branch2
|
|
created new head
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: conflicts during merge.
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ hg id
|
|
32e80765d7fe+75234512624c+ tip
|
|
|
|
$ cat a
|
|
<<<<<<< local: 32e80765d7fe - test: branch2
|
|
something else
|
|
=======
|
|
something
|
|
>>>>>>> other: 75234512624c - test: branch1
|
|
|
|
$ hg status
|
|
M a
|
|
? a.orig
|
|
|
|
Verify custom conflict markers
|
|
|
|
$ hg up -q --clean .
|
|
$ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: conflicts during merge.
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ cat a
|
|
<<<<<<< local: test 2
|
|
something else
|
|
=======
|
|
something
|
|
>>>>>>> other: test 1
|
|
|
|
Verify basic conflict markers
|
|
|
|
$ hg up -q --clean .
|
|
$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: conflicts during merge.
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ cat a
|
|
<<<<<<< local
|
|
something else
|
|
=======
|
|
something
|
|
>>>>>>> other
|