changeset 2858 | 4b934144ed11 |
parent 2856 | f6517779a7c4 |
child 2929 | 06844693bb21 |
--- a/tests/test-touch.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-touch.t Thu Aug 24 10:57:32 2017 -0700 @@ -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 contentdivergent changesets + 2 new content-divergent changesets $ hg log -G @ 4:[0-9a-f]{12} a (re)