tests/test-sharing.t
changeset 4633 61c2518cd6d2
parent 4624 c9798965b1f4
child 4672 653c42af172e
child 4930 44f340c2a8eb
--- a/tests/test-sharing.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-sharing.t	Fri Apr 26 01:20:08 2019 +0530
@@ -516,7 +516,6 @@
   merge:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
-  merging "other" content-divergent changeset 'e3f99ce9d9cd'
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at b1499b0f03ca
   $ hg log -q -r 'contentdivergent()'