Show More
@@ -33,6 +33,12 b' hg -v imerge st' | |||||
33 | echo % next |
|
33 | echo % next | |
34 | hg imerge next |
|
34 | hg imerge next | |
35 |
|
35 | |||
|
36 | echo % resolve and unresolve | |||
|
37 | hg imerge resolve foo | |||
|
38 | hg -v imerge st | |||
|
39 | hg imerge unresolve foo | |||
|
40 | hg -v imerge st | |||
|
41 | ||||
36 | echo % merge next |
|
42 | echo % merge next | |
37 | hg --traceback imerge |
|
43 | hg --traceback imerge | |
38 |
|
44 |
@@ -15,6 +15,12 b' merging e6da46716401 and 30d266f502e7' | |||||
15 | U foo (foo2) |
|
15 | U foo (foo2) | |
16 | % next |
|
16 | % next | |
17 | foo |
|
17 | foo | |
|
18 | % resolve and unresolve | |||
|
19 | merging e6da46716401 and 30d266f502e7 | |||
|
20 | R foo (foo2) | |||
|
21 | all conflicts resolved | |||
|
22 | merging e6da46716401 and 30d266f502e7 | |||
|
23 | U foo (foo2) | |||
18 | % merge next |
|
24 | % merge next | |
19 | merging foo and foo2 |
|
25 | merging foo and foo2 | |
20 | all conflicts resolved |
|
26 | all conflicts resolved |
General Comments 0
You need to be logged in to leave comments.
Login now