branch | mercurial-4.4 |
changeset 4363 | a2fdbece7ce1 |
parent 3590 | d5adce52cef4 |
child 3591 | 98941c28f3e2 |
--- a/tests/test-exchange-obsmarkers-case-C4.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-exchange-obsmarkers-case-C4.t Tue Jan 22 12:57:25 2019 -0500 @@ -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