--- a/tests/test-evolve-content-divergent-corner-cases.t Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t Sun Apr 14 02:18:19 2019 +0800
@@ -72,7 +72,7 @@
o 0:9092f1db7931@default(draft) added a []
- $ hg evolve --all --any --content-divergent
+ $ hg evolve --all --any --content-divergent --update
merge:[2] divergent
with: [3] divergent
base: [1] added b
@@ -275,7 +275,7 @@
o 0:9092f1db7931 added a
() [default] draft
- $ hg evolve --content-divergent --any
+ $ hg evolve --content-divergent --any --update
merge:[5] updated e
with: [6] updated e
base: [4] added e
@@ -363,7 +363,7 @@
Resolve the divergence, only "a" should be removed
- $ hg evolve --content-divergent
+ $ hg evolve --content-divergent --update
merge:[3] delete a
with: [2] delete a
base: [1] delete a