--- a/tests/test-evolve-public-content-divergent.t Sat Feb 23 00:47:14 2019 +0530
+++ b/tests/test-evolve-public-content-divergent.t Mon Feb 25 22:50:24 2019 +0530
@@ -63,10 +63,11 @@
Lets resolve the public content-divergence:
$ hg evolve --content-divergent
- merge:[3] updated b
- with: [2] added b
+ merge:[2] added b
+ with: [3] updated b
base: [1] added b
- merging "other" content-divergent changeset '44f360db368f'
+ updating to "local" side of the conflict: 44f360db368f
+ merging "other" content-divergent changeset 'dcdaf152280a'
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
computing new diff
@@ -160,10 +161,11 @@
Lets resolve the divergence:
$ hg evolve --content-divergent
- merge:[3] updated b
- with: [2] added b
+ merge:[2] added b
+ with: [3] updated b
base: [1] added b
- merging "other" content-divergent changeset '580f2d01e52c'
+ updating to "local" side of the conflict: 580f2d01e52c
+ merging "other" content-divergent changeset '0e805383168e'
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved