tests/test-evolve-continue.t
changeset 4122 4eb3877540f1
parent 3852 629558d09898
child 4173 e268f7fd7839
child 4376 0fbf895ce160
child 4425 43c24cf6d24b
--- a/tests/test-evolve-continue.t	Tue Sep 18 02:14:10 2018 +0200
+++ b/tests/test-evolve-continue.t	Fri Sep 21 15:52:53 2018 +0530
@@ -166,7 +166,6 @@
   move:[5] added c
   atop:[10] added b
   move:[8] added d
-  atop:[11] added c
   working directory is now at 6642d2c9176e
 
   $ hg glog
@@ -237,7 +236,6 @@
   move:[12] added d
   atop:[16] added c
   move:[13] added f
-  atop:[17] added d
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
@@ -252,7 +250,6 @@
   move:[14] added g
   atop:[18] added f
   move:[15] added h
-  atop:[19] added g
   merging h
   warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`