changeset 35709 | 1a09dad8b85a |
parent 33542 | b11e8c67fb0f |
child 42893 | 34a46d48d24e |
--- a/tests/test-exchange-obsmarkers-case-C4.t Wed Jan 10 14:00:23 2018 -0800 +++ b/tests/test-exchange-obsmarkers-case-C4.t Sun Jan 14 23:59:17 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