--- a/tests/test-evolve.t Tue Sep 18 02:14:10 2018 +0200
+++ b/tests/test-evolve.t Fri Sep 21 15:52:53 2018 +0530
@@ -468,7 +468,6 @@
atop:[10] dansk!
merging main-file-1
move:[9] dansk 3!
- atop:[11] dansk 2!
merging main-file-1
working directory is now at 96abb1319a47
$ hg log -G
@@ -1291,7 +1290,6 @@
move:[20] add j2
atop:[23] add j1
move:[21] add j3
- atop:[24] add j2
working directory is now at 0d9203b74542
$ glog -r "0cf3707e8971::"
@ 25:0d9203b74542@default(draft) add j3
@@ -1465,7 +1463,6 @@
move:[35] will be evolved safely
atop:[37] amended
move:[36] will cause conflict at evolve
- atop:[38] will be evolved safely
merging newfile
warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`