changeset 3431 | 2e703ed1c713 |
parent 2754 | 21f06d932231 |
child 3559 | d166b3dc5e8a |
--- a/tests/test-exchange-obsmarkers-case-C4.t Fri Jan 19 19:18:05 2018 +0100 +++ b/tests/test-exchange-obsmarkers-case-C4.t Sat Jan 13 14:35:49 2018 -0800 @@ -67,6 +67,7 @@ $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` obsoleted 1 changesets $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` + 2 new content-divergent changesets $ hg prune -qd '0 0' . $ hg log -G --hidden x 7f7f229b13a6 (draft): C