--- a/tests/test-sharing.t Sat Jun 01 02:30:14 2019 +0200
+++ b/tests/test-sharing.t Tue Jun 04 11:08:44 2019 +0200
@@ -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()'
@@ -534,7 +533,7 @@
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
~
- $ hg --hidden shortlog -r 'precursors(b1499b0f03ca)'
+ $ hg --hidden shortlog -r 'predecessors(b1499b0f03ca)'
5:a360947f6faf draft fix bug 24 (v2 by bob)
6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
$ cat file1