equal
deleted
inserted
replaced
40 merging a |
40 merging a |
41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
41 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
42 warning: internal :merge cannot merge symlinks for a |
42 warning: internal :merge cannot merge symlinks for a |
43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
45 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
45 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
46 [1] |
46 [1] |
47 |
47 |
48 $ tellmeabout a |
48 $ tellmeabout a |
49 a is a symlink: |
49 a is a symlink: |
50 a -> symlink |
50 a -> symlink |
73 merging a |
73 merging a |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
75 warning: internal :union cannot merge symlinks for a |
75 warning: internal :union cannot merge symlinks for a |
76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
78 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
78 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
79 [1] |
79 [1] |
80 |
80 |
81 $ tellmeabout a |
81 $ tellmeabout a |
82 a is an executable file with content: |
82 a is an executable file with content: |
83 a |
83 a |
96 merging a |
96 merging a |
97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
97 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
98 warning: internal :merge3 cannot merge symlinks for a |
98 warning: internal :merge3 cannot merge symlinks for a |
99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
99 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
100 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
100 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
101 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
101 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
102 [1] |
102 [1] |
103 |
103 |
104 $ tellmeabout a |
104 $ tellmeabout a |
105 a is an executable file with content: |
105 a is an executable file with content: |
106 a |
106 a |
118 picked tool ':merge-local' for a (binary False symlink True changedelete False) |
118 picked tool ':merge-local' for a (binary False symlink True changedelete False) |
119 merging a |
119 merging a |
120 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
120 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
121 warning: internal :merge-local cannot merge symlinks for a |
121 warning: internal :merge-local cannot merge symlinks for a |
122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
123 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
123 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
124 [1] |
124 [1] |
125 |
125 |
126 $ tellmeabout a |
126 $ tellmeabout a |
127 a is an executable file with content: |
127 a is an executable file with content: |
128 a |
128 a |
140 picked tool ':merge-other' for a (binary False symlink True changedelete False) |
140 picked tool ':merge-other' for a (binary False symlink True changedelete False) |
141 merging a |
141 merging a |
142 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
142 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
143 warning: internal :merge-other cannot merge symlinks for a |
143 warning: internal :merge-other cannot merge symlinks for a |
144 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
144 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
145 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
145 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
146 [1] |
146 [1] |
147 |
147 |
148 $ tellmeabout a |
148 $ tellmeabout a |
149 a is an executable file with content: |
149 a is an executable file with content: |
150 a |
150 a |
209 $ hg merge |
209 $ hg merge |
210 merging f |
210 merging f |
211 warning: internal :merge cannot merge symlinks for f |
211 warning: internal :merge cannot merge symlinks for f |
212 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
212 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
213 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
213 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
214 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
214 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
215 [1] |
215 [1] |
216 $ tellmeabout f |
216 $ tellmeabout f |
217 f is a symlink: |
217 f is a symlink: |
218 f -> base |
218 f -> base |
219 |
219 |
221 $ hg merge |
221 $ hg merge |
222 merging f |
222 merging f |
223 warning: internal :merge cannot merge symlinks for f |
223 warning: internal :merge cannot merge symlinks for f |
224 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
224 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
226 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
226 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
227 [1] |
227 [1] |
228 $ tellmeabout f |
228 $ tellmeabout f |
229 f is a plain file with content: |
229 f is a plain file with content: |
230 file |
230 file |
231 content |
231 content |
248 $ hg merge |
248 $ hg merge |
249 merging f |
249 merging f |
250 warning: internal :merge cannot merge symlinks for f |
250 warning: internal :merge cannot merge symlinks for f |
251 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
251 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
252 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
252 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
253 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
253 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
254 [1] |
254 [1] |
255 $ tellmeabout f |
255 $ tellmeabout f |
256 f is a symlink: |
256 f is a symlink: |
257 f -> dangling |
257 f -> dangling |
258 |
258 |
260 $ hg merge |
260 $ hg merge |
261 merging f |
261 merging f |
262 warning: internal :merge cannot merge symlinks for f |
262 warning: internal :merge cannot merge symlinks for f |
263 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
263 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
264 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
264 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
265 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
265 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
266 [1] |
266 [1] |
267 $ tellmeabout f |
267 $ tellmeabout f |
268 f is a plain file with content: |
268 f is a plain file with content: |
269 f |
269 f |
270 |
270 |
352 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
352 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
354 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
354 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
355 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
355 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
356 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
356 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
357 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
357 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
358 [1] |
358 [1] |
359 $ hg resolve -l |
359 $ hg resolve -l |
360 U a |
360 U a |
361 U b |
361 U b |
362 U bx |
362 U bx |
414 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
414 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
415 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
415 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
416 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
416 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
417 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
417 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
418 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
418 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
419 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
419 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
420 [1] |
420 [1] |
421 $ tellmeabout a |
421 $ tellmeabout a |
422 a is a plain file with content: |
422 a is a plain file with content: |
423 <<<<<<< working copy: 2e60aa20b912 - test: 1 |
423 <<<<<<< working copy: 2e60aa20b912 - test: 1 |
424 1 |
424 1 |