branch | mercurial-4.4 |
changeset 3590 | d5adce52cef4 |
parent 3566 | e6bea259c227 |
child 3591 | 98941c28f3e2 |
--- a/tests/test-exchange-obsmarkers-case-C4.t Wed Mar 21 16:03:46 2018 +0100 +++ b/tests/test-exchange-obsmarkers-case-C4.t Wed Mar 21 16:06:17 2018 +0100 @@ -67,7 +67,6 @@ $ 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