Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-continue.t
changeset 3852 629558d09898
parent 3843 f0096db2a7b1
child 3930 d00f0c369bc7
child 4122 4eb3877540f1 
--- a/tests/test-evolve-continue.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-continue.t	Fri Jun 15 00:16:29 2018 +0530
@@ -58,8 +58,8 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo foo > d
   $ hg resolve -m
@@ -115,8 +115,8 @@
   atop:[8] added d
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo bar > e
   $ hg resolve -m
@@ -154,8 +154,8 @@
   atop:[9] added a
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo foo > b
   $ hg resolve -m
@@ -240,8 +240,8 @@
   atop:[17] added d
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo foo > f
   $ hg resolve -m
@@ -255,8 +255,8 @@
   atop:[19] added g
   merging h
   warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo foo > h
   $ hg resolve -m
@@ -301,8 +301,8 @@
   perform evolve? [Ny] y
   merging g
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ echo foo > g
   $ hg resolve -m
@@ -351,8 +351,8 @@
   atop:[24] added f
   merging g
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
   $ echo foo > g
   $ hg resolve -m
   (no more unresolved files)
evolve