diff -r 80894dbf9899 -r 6565eac61ebf tests/test-exchange-obsmarkers-case-C4.t --- a/tests/test-exchange-obsmarkers-case-C4.t Sat Jan 20 12:48:26 2018 +0100 +++ b/tests/test-exchange-obsmarkers-case-C4.t Wed Jan 24 15:11:20 2018 +0100 @@ -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