equal
deleted
inserted
replaced
271 > z |
271 > z |
272 > a |
272 > a |
273 > EOF |
273 > EOF |
274 $ hg ci -mc -d '3 0' |
274 $ hg ci -mc -d '3 0' |
275 created new head |
275 created new head |
276 BROKEN: 'a' was copied to 'b' on both sides. We should not get a merge conflict here |
|
277 $ hg merge |
276 $ hg merge |
278 merging b |
277 merging b |
279 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
278 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
280 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
279 (branch merge, don't forget to commit) |
281 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
282 [1] |
|
283 $ cat b |
|
284 <<<<<<< working copy: b80e3e32f75a - test: c |
|
285 a |
|
286 z |
|
287 a |
|
288 ||||||| base |
|
289 ======= |
|
290 a |
|
291 a |
|
292 a |
|
293 b4 |
|
294 c |
|
295 b5 |
|
296 >>>>>>> merge rev: 64afcdf8e29e - test: mergeb |
|
297 $ cat <<EOF > b |
|
298 > a |
|
299 > z |
|
300 > a |
|
301 > b4 |
|
302 > c |
|
303 > b5 |
|
304 > EOF |
|
305 $ hg resolve --mark -q |
|
306 $ rm b.orig |
|
307 $ echo d >> b |
280 $ echo d >> b |
308 $ hg ci -mmerge2 -d '4 0' |
281 $ hg ci -mmerge2 -d '4 0' |
309 |
282 |
310 annotate after rename merge |
283 annotate after rename merge |
311 |
284 |