equal
deleted
inserted
replaced
4 |
4 |
5 hg init repo |
5 hg init repo |
6 cd repo |
6 cd repo |
7 |
7 |
8 echo foo > file |
8 echo foo > file |
9 hg commit -Am 'add file' -d '0 0' |
9 hg commit -Am 'add file' |
10 |
10 |
11 echo bar >> file |
11 echo bar >> file |
12 hg commit -Am 'append bar' -d '0 0' |
12 hg commit -Am 'append bar' |
13 |
13 |
14 echo % create a second head |
14 echo % create a second head |
15 hg up -C 0 |
15 hg up -C 0 |
16 echo baz >> file |
16 echo baz >> file |
17 hg commit -Am 'append baz' -d '0 0' |
17 hg commit -Am 'append baz' |
18 |
18 |
19 echo % failing merge |
19 echo % failing merge |
20 HGMERGE=internal:fail hg merge |
20 HGMERGE=internal:fail hg merge |
21 |
21 |
22 echo resolved > file |
22 echo resolved > file |
23 hg resolve -m file |
23 hg resolve -m file |
24 hg commit -m 'resolved' -d '0 0' |
24 hg commit -m 'resolved' |
25 |
25 |
26 echo % resolve -l, should be empty |
26 echo % resolve -l, should be empty |
27 hg resolve -l |
27 hg resolve -l |