Show More
@@ -262,7 +262,11 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
262 | _matcheol(repo.wjoin(fd), back) |
|
262 | _matcheol(repo.wjoin(fd), back) | |
263 |
|
263 | |||
264 | if r: |
|
264 | if r: | |
265 | ui.warn(_("merging %s failed!\n") % fd) |
|
265 | if tool == "internal:merge": | |
|
266 | ui.warn(_("merging %s incomplete! " | |||
|
267 | "(edit conflicts, then use 'hg resolve --mark')\n") % fd) | |||
|
268 | else: | |||
|
269 | ui.warn(_("merging %s failed!\n") % fd) | |||
266 | else: |
|
270 | else: | |
267 | os.unlink(back) |
|
271 | os.unlink(back) | |
268 |
|
272 |
@@ -88,7 +88,7 b' should fail' | |||||
88 | $ hg merge |
|
88 | $ hg merge | |
89 | merging a |
|
89 | merging a | |
90 | warning: conflicts during merge. |
|
90 | warning: conflicts during merge. | |
91 | merging a failed! |
|
91 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
92 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
92 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
93 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
93 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
94 | [1] |
|
94 | [1] |
@@ -29,7 +29,7 b' Merging a conflict araises' | |||||
29 | $ hg merge |
|
29 | $ hg merge | |
30 | merging A |
|
30 | merging A | |
31 | warning: conflicts during merge. |
|
31 | warning: conflicts during merge. | |
32 | merging A failed! |
|
32 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
33 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
33 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
34 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
34 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
35 | [1] |
|
35 | [1] |
@@ -13,7 +13,7 b'' | |||||
13 | $ hg merge 1 |
|
13 | $ hg merge 1 | |
14 | merging a |
|
14 | merging a | |
15 | warning: conflicts during merge. |
|
15 | warning: conflicts during merge. | |
16 | merging a failed! |
|
16 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
17 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
17 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
18 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
18 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
19 | [1] |
|
19 | [1] |
@@ -416,7 +416,7 b' Branchy history' | |||||
416 | $ hg --cwd b merge |
|
416 | $ hg --cwd b merge | |
417 | merging b |
|
417 | merging b | |
418 | warning: conflicts during merge. |
|
418 | warning: conflicts during merge. | |
419 | merging b failed! |
|
419 | merging b incomplete! (edit conflicts, then use 'hg resolve --mark') | |
420 | 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
420 | 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
421 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
421 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
422 | [1] |
|
422 | [1] |
@@ -151,7 +151,7 b' Graft out of order, skipping a merge and' | |||||
151 | merging e |
|
151 | merging e | |
152 | my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622 |
|
152 | my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622 | |
153 | warning: conflicts during merge. |
|
153 | warning: conflicts during merge. | |
154 | merging e failed! |
|
154 | merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | |
155 | searching for copies back to rev 1 |
|
155 | searching for copies back to rev 1 | |
156 | unmatched files in local: |
|
156 | unmatched files in local: | |
157 | c |
|
157 | c |
@@ -976,7 +976,7 b' conflict: keyword should stay outside co' | |||||
976 | $ hg merge |
|
976 | $ hg merge | |
977 | merging m |
|
977 | merging m | |
978 | warning: conflicts during merge. |
|
978 | warning: conflicts during merge. | |
979 | merging m failed! |
|
979 | merging m incomplete! (edit conflicts, then use 'hg resolve --mark') | |
980 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
980 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
981 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
981 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
982 | [1] |
|
982 | [1] |
@@ -84,7 +84,7 b' add some changesets to rename/remove/mer' | |||||
84 | $ hg merge |
|
84 | $ hg merge | |
85 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
|
85 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat | |
86 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
|
86 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) | |
87 | merging stuff/maybelarge.dat failed! |
|
87 | merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') | |
88 | merging sub/normal2 and stuff/normal2 to stuff/normal2 |
|
88 | merging sub/normal2 and stuff/normal2 to stuff/normal2 | |
89 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
89 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved | |
90 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
90 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
@@ -922,7 +922,7 b' log -p -R repo' | |||||
922 | $ hg merge 7 |
|
922 | $ hg merge 7 | |
923 | merging foo |
|
923 | merging foo | |
924 | warning: conflicts during merge. |
|
924 | warning: conflicts during merge. | |
925 | merging foo failed! |
|
925 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
926 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
926 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
927 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
927 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
928 | [1] |
|
928 | [1] | |
@@ -933,7 +933,7 b' log -p -R repo' | |||||
933 | $ hg merge 4 |
|
933 | $ hg merge 4 | |
934 | merging foo |
|
934 | merging foo | |
935 | warning: conflicts during merge. |
|
935 | warning: conflicts during merge. | |
936 | merging foo failed! |
|
936 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
937 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
937 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
938 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
938 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
939 | [1] |
|
939 | [1] |
@@ -63,7 +63,7 b' Local merge with bad merge tool:' | |||||
63 | merging zzz1_merge_ok |
|
63 | merging zzz1_merge_ok | |
64 | merging zzz2_merge_bad |
|
64 | merging zzz2_merge_bad | |
65 | warning: conflicts during merge. |
|
65 | warning: conflicts during merge. | |
66 | merging zzz2_merge_bad failed! |
|
66 | merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') | |
67 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
|
67 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |
68 | use 'hg resolve' to retry unresolved file merges |
|
68 | use 'hg resolve' to retry unresolved file merges | |
69 | [1] |
|
69 | [1] | |
@@ -88,7 +88,7 b' Local merge with conflicts:' | |||||
88 | merging zzz1_merge_ok |
|
88 | merging zzz1_merge_ok | |
89 | merging zzz2_merge_bad |
|
89 | merging zzz2_merge_bad | |
90 | warning: conflicts during merge. |
|
90 | warning: conflicts during merge. | |
91 | merging zzz2_merge_bad failed! |
|
91 | merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') | |
92 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
|
92 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | |
93 | use 'hg resolve' to retry unresolved file merges |
|
93 | use 'hg resolve' to retry unresolved file merges | |
94 | [1] |
|
94 | [1] | |
@@ -97,7 +97,7 b' Local merge with conflicts:' | |||||
97 | merging zzz1_merge_ok |
|
97 | merging zzz1_merge_ok | |
98 | merging zzz2_merge_bad |
|
98 | merging zzz2_merge_bad | |
99 | warning: conflicts during merge. |
|
99 | warning: conflicts during merge. | |
100 | merging zzz2_merge_bad failed! |
|
100 | merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') | |
101 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
|
101 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |
102 | use 'hg resolve' to retry unresolved file merges |
|
102 | use 'hg resolve' to retry unresolved file merges | |
103 | [1] |
|
103 | [1] |
@@ -45,7 +45,7 b'' | |||||
45 | $ hg update |
|
45 | $ hg update | |
46 | merging file1 |
|
46 | merging file1 | |
47 | warning: conflicts during merge. |
|
47 | warning: conflicts during merge. | |
48 | merging file1 failed! |
|
48 | merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') | |
49 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
49 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
50 | use 'hg resolve' to retry unresolved file merges |
|
50 | use 'hg resolve' to retry unresolved file merges | |
51 | [1] |
|
51 | [1] |
@@ -66,7 +66,7 b' running from a devel copy, not a temp in' | |||||
66 | $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
|
66 | $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 | |
67 | merging f |
|
67 | merging f | |
68 | warning: conflicts during merge. |
|
68 | warning: conflicts during merge. | |
69 | merging f failed! |
|
69 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
70 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
70 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
71 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
71 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
72 | [1] |
|
72 | [1] |
@@ -45,7 +45,7 b' now pull and merge from test-a' | |||||
45 | $ hg merge |
|
45 | $ hg merge | |
46 | merging test.txt |
|
46 | merging test.txt | |
47 | warning: conflicts during merge. |
|
47 | warning: conflicts during merge. | |
48 | merging test.txt failed! |
|
48 | merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | |
49 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
49 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
50 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
50 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
51 | [1] |
|
51 | [1] | |
@@ -90,7 +90,7 b' pull and merge from test-a again' | |||||
90 | merging test.txt |
|
90 | merging test.txt | |
91 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
|
91 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | |
92 | warning: conflicts during merge. |
|
92 | warning: conflicts during merge. | |
93 | merging test.txt failed! |
|
93 | merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | |
94 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
94 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
95 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
95 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
96 | [1] |
|
96 | [1] |
@@ -83,7 +83,7 b' resolve all' | |||||
83 | $ hg resolve -a |
|
83 | $ hg resolve -a | |
84 | merging bar |
|
84 | merging bar | |
85 | warning: conflicts during merge. |
|
85 | warning: conflicts during merge. | |
86 | merging bar failed! |
|
86 | merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') | |
87 | [1] |
|
87 | [1] | |
88 |
|
88 | |||
89 | after |
|
89 | after |
@@ -155,7 +155,7 b' plain headers' | |||||
155 | created new head |
|
155 | created new head | |
156 | merging a |
|
156 | merging a | |
157 | warning: conflicts during merge. |
|
157 | warning: conflicts during merge. | |
158 | merging a failed! |
|
158 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
159 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
159 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
160 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
160 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
161 | abort: cannot manage merge changesets |
|
161 | abort: cannot manage merge changesets | |
@@ -228,7 +228,7 b' hg headers' | |||||
228 | created new head |
|
228 | created new head | |
229 | merging a |
|
229 | merging a | |
230 | warning: conflicts during merge. |
|
230 | warning: conflicts during merge. | |
231 | merging a failed! |
|
231 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
232 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
232 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
233 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
233 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
234 | abort: cannot manage merge changesets |
|
234 | abort: cannot manage merge changesets |
@@ -49,7 +49,7 b' Conflicting rebase:' | |||||
49 | $ hg rebase -s 3 -d 2 |
|
49 | $ hg rebase -s 3 -d 2 | |
50 | merging common |
|
50 | merging common | |
51 | warning: conflicts during merge. |
|
51 | warning: conflicts during merge. | |
52 | merging common failed! |
|
52 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
53 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
53 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
54 | [255] |
|
54 | [255] | |
55 |
|
55 | |||
@@ -117,7 +117,7 b' Rebase and abort without generating new ' | |||||
117 | $ hg rebase -b 4 -d 2 |
|
117 | $ hg rebase -b 4 -d 2 | |
118 | merging c |
|
118 | merging c | |
119 | warning: conflicts during merge. |
|
119 | warning: conflicts during merge. | |
120 | merging c failed! |
|
120 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
121 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
121 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
122 | [255] |
|
122 | [255] | |
123 |
|
123 |
@@ -63,7 +63,7 b' Rebasing B onto E - check keep:' | |||||
63 | $ hg rebase -s 1 -d 4 --keep |
|
63 | $ hg rebase -s 1 -d 4 --keep | |
64 | merging A |
|
64 | merging A | |
65 | warning: conflicts during merge. |
|
65 | warning: conflicts during merge. | |
66 | merging A failed! |
|
66 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
67 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
67 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
68 | [255] |
|
68 | [255] | |
69 |
|
69 | |||
@@ -115,7 +115,7 b' Rebase F onto E - check keepbranches:' | |||||
115 | $ hg rebase -s 5 -d 4 --keepbranches |
|
115 | $ hg rebase -s 5 -d 4 --keepbranches | |
116 | merging A |
|
116 | merging A | |
117 | warning: conflicts during merge. |
|
117 | warning: conflicts during merge. | |
118 | merging A failed! |
|
118 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
119 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
119 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
120 | [255] |
|
120 | [255] | |
121 |
|
121 |
@@ -58,7 +58,7 b' Conflicting rebase:' | |||||
58 | $ hg rebase -s 3 -d 2 |
|
58 | $ hg rebase -s 3 -d 2 | |
59 | merging common |
|
59 | merging common | |
60 | warning: conflicts during merge. |
|
60 | warning: conflicts during merge. | |
61 | merging common failed! |
|
61 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
62 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
62 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
63 | [255] |
|
63 | [255] | |
64 |
|
64 |
@@ -367,7 +367,7 b' Ensure --continue restores a correct sta' | |||||
367 | $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail |
|
367 | $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail | |
368 | merging H |
|
368 | merging H | |
369 | warning: conflicts during merge. |
|
369 | warning: conflicts during merge. | |
370 | merging H failed! |
|
370 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') | |
371 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
371 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
372 | [255] |
|
372 | [255] | |
373 | $ hg resolve --all -t internal:local |
|
373 | $ hg resolve --all -t internal:local |
@@ -56,7 +56,7 b' Rebasing B onto E:' | |||||
56 | $ hg rebase -s 1 -d 4 |
|
56 | $ hg rebase -s 1 -d 4 | |
57 | merging A |
|
57 | merging A | |
58 | warning: conflicts during merge. |
|
58 | warning: conflicts during merge. | |
59 | merging A failed! |
|
59 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
60 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
60 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
61 | [255] |
|
61 | [255] | |
62 |
|
62 | |||
@@ -88,7 +88,7 b' Resume the rebasing:' | |||||
88 | $ hg rebase --continue |
|
88 | $ hg rebase --continue | |
89 | merging A |
|
89 | merging A | |
90 | warning: conflicts during merge. |
|
90 | warning: conflicts during merge. | |
91 | merging A failed! |
|
91 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
92 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
92 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
93 | [255] |
|
93 | [255] | |
94 |
|
94 | |||
@@ -142,7 +142,7 b' Rebasing B onto E:' | |||||
142 | $ hg rebase -s 1 -d 4 |
|
142 | $ hg rebase -s 1 -d 4 | |
143 | merging A |
|
143 | merging A | |
144 | warning: conflicts during merge. |
|
144 | warning: conflicts during merge. | |
145 | merging A failed! |
|
145 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
146 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
146 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
147 | [255] |
|
147 | [255] | |
148 |
|
148 |
@@ -62,7 +62,7 b' Rebase - generate a conflict:' | |||||
62 | $ hg rebase -s 2 -d 1 |
|
62 | $ hg rebase -s 2 -d 1 | |
63 | merging f |
|
63 | merging f | |
64 | warning: conflicts during merge. |
|
64 | warning: conflicts during merge. | |
65 | merging f failed! |
|
65 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
66 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
66 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
67 | [255] |
|
67 | [255] | |
68 |
|
68 | |||
@@ -73,7 +73,7 b' Fix the 1st conflict:' | |||||
73 | $ hg rebase -c |
|
73 | $ hg rebase -c | |
74 | merging f |
|
74 | merging f | |
75 | warning: conflicts during merge. |
|
75 | warning: conflicts during merge. | |
76 | merging f failed! |
|
76 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
77 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
77 | abort: unresolved conflicts (see hg resolve, then hg rebase --continue) | |
78 | [255] |
|
78 | [255] | |
79 |
|
79 |
@@ -280,10 +280,10 b" test 'resolve -l'" | |||||
280 | $ hg merge |
|
280 | $ hg merge | |
281 | merging a |
|
281 | merging a | |
282 | warning: conflicts during merge. |
|
282 | warning: conflicts during merge. | |
283 | merging a failed! |
|
283 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
284 | merging b |
|
284 | merging b | |
285 | warning: conflicts during merge. |
|
285 | warning: conflicts during merge. | |
286 | merging b failed! |
|
286 | merging b incomplete! (edit conflicts, then use 'hg resolve --mark') | |
287 | 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
287 | 0 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
288 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
288 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
289 | [1] |
|
289 | [1] |
@@ -245,7 +245,7 b' merge tests' | |||||
245 | merging t |
|
245 | merging t | |
246 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
246 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | |
247 | warning: conflicts during merge. |
|
247 | warning: conflicts during merge. | |
248 | merging t failed! |
|
248 | merging t incomplete! (edit conflicts, then use 'hg resolve --mark') | |
249 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
249 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
250 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
250 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
251 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
251 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -21,7 +21,7 b' Update with local changes across a file ' | |||||
21 | $ hg up |
|
21 | $ hg up | |
22 | merging a and b to b |
|
22 | merging a and b to b | |
23 | warning: conflicts during merge. |
|
23 | warning: conflicts during merge. | |
24 | merging b failed! |
|
24 | merging b incomplete! (edit conflicts, then use 'hg resolve --mark') | |
25 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
25 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
26 | use 'hg resolve' to retry unresolved file merges |
|
26 | use 'hg resolve' to retry unresolved file merges | |
27 | [1] |
|
27 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now