diff -r 1db0137297f4 -r f6517779a7c4 tests/test-touch.t --- a/tests/test-touch.t Thu Aug 24 09:11:54 2017 +0200 +++ b/tests/test-touch.t Thu Aug 24 09:12:09 2017 +0200 @@ -44,7 +44,7 @@ [1] a reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a - 2 new divergent changesets + 2 new contentdivergent changesets $ hg log -G @ 4:[0-9a-f]{12} a (re)