--- a/tests/test-obsolete.t Thu Aug 24 10:48:38 2017 -0700
+++ b/tests/test-obsolete.t Thu Aug 24 10:57:32 2017 -0700
@@ -521,7 +521,7 @@
$ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
rebasing 3:0d3f46688ccc "add obsol_c"
rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
- 2 new contentdivergent changesets
+ 2 new content-divergent changesets
$ hg --hidden log -q -r 'successors(3)'
4:725c380fe99b
10:2033b4e49474
@@ -572,7 +572,7 @@
$ cd local
$ hg phase --hidden --public 11
- 1 new phasedivergent changesets
+ 1 new phase-divergent changesets
$ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
@ 12 - (draft) 6db5e282cb91 add obsol_d'''
|