--- a/tests/test-stabilize-result.t Thu Aug 10 17:37:31 2017 +0200
+++ b/tests/test-stabilize-result.t Thu Aug 10 17:57:50 2017 +0200
@@ -247,14 +247,14 @@
Stabilize it
- $ hg evolve -qn --confirm --divergent
+ $ hg evolve -qn --confirm --contentdivergent
merge:[19] More addition
with: [17] More addition
base: [15] More addition
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
- $ echo y | hg evolve -qn --confirm --config ui.interactive=True --divergent
+ $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent
merge:[19] More addition
with: [17] More addition
base: [15] More addition
@@ -265,7 +265,7 @@
hg up -C 3932c176bbaa &&
hg revert --all --rev tip &&
hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
- $ hg evolve -v --divergent
+ $ hg evolve -v --contentdivergent
merge:[19] More addition
with: [17] More addition
base: [15] More addition
@@ -344,14 +344,14 @@
$ hg phase 'divergent()'
21: draft
24: draft
- $ hg evolve -qn --divergent
+ $ hg evolve -qn --contentdivergent
hg update -c 0b336205a5d0 &&
hg merge f344982e63c4 &&
hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
hg up -C 3932c176bbaa &&
hg revert --all --rev tip &&
hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
- $ hg evolve --divergent
+ $ hg evolve --contentdivergent
merge:[24] More addition (2)
with: [21] More addition
base: [15] More addition