equal
deleted
inserted
replaced
200 $ hg debugp1copies |
200 $ hg debugp1copies |
201 $ hg debugp2copies |
201 $ hg debugp2copies |
202 $ hg ci -m 'merge rename from p2' |
202 $ hg ci -m 'merge rename from p2' |
203 $ hg l |
203 $ hg l |
204 @ 3 merge rename from p2 |
204 @ 3 merge rename from p2 |
205 |\ x |
205 |\ |
206 | o 2 add z |
206 | o 2 add z |
207 | | z |
207 | | z |
208 o | 1 rename x to y |
208 o | 1 rename x to y |
209 |/ x y |
209 |/ x y |
210 o 0 add x |
210 o 0 add x |
415 $ hg resolve -qm z |
415 $ hg resolve -qm z |
416 $ hg ci -m 'merge 3 into 1' |
416 $ hg ci -m 'merge 3 into 1' |
417 created new head |
417 created new head |
418 $ hg l |
418 $ hg l |
419 @ 5 merge 3 into 1 |
419 @ 5 merge 3 into 1 |
420 |\ y z |
420 |\ z |
421 +---o 4 merge 1 into 3 |
421 +---o 4 merge 1 into 3 |
422 | |/ x z |
422 | |/ z |
423 | o 3 modify z |
423 | o 3 modify z |
424 | | z |
424 | | z |
425 | o 2 rename y to z |
425 | o 2 rename y to z |
426 | | y z |
426 | | y z |
427 o | 1 rename x to z |
427 o | 1 rename x to z |