--- a/tests/test-evolve-content-divergent-interrupted.t Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t Fri Apr 26 01:20:08 2019 +0530
@@ -83,7 +83,6 @@
merge:[6] added d
with: [5] added d
base: [4] added d
- merging "other" content-divergent changeset 'e49523854bc8'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -191,14 +190,10 @@
merge:[8] added c
with: [10] added c
base: [3] added c
- updating to "local" side of the conflict: 2ba73e31f264
- merging "other" content-divergent changeset '491e10505bae'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge:[5] added d
with: [7] added d
base: [4] added d
- updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset 'f0f1694f123e'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -358,8 +353,6 @@
with: [8] added d
base: [4] added d
rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
- updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset 'a663d1567f0b'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -451,7 +444,6 @@
merge:[6] added d
with: [5] added d
base: [4] added d
- merging "other" content-divergent changeset 'e49523854bc8'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -504,8 +496,6 @@
with: [7] added d
base: [4] added d
rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
- updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset '606ad96040fc'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved