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-abort-phasediv.t
changeset 3852 629558d09898
parent 3843 f0096db2a7b1
child 3930 d00f0c369bc7
child 3976 d081528bb372 
--- a/tests/test-evolve-abort-phasediv.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-evolve-abort-phasediv.t	Fri Jun 15 00:16:29 2018 +0530
@@ -87,8 +87,8 @@
   rebasing to destination parent: ca1b80f7960a
   merging c
   warning: conflicts while merging c! (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]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -199,8 +199,8 @@
   rebasing to destination parent: b1661037fa25
   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]
 
   $ hg evolve --abort
   1 new phase-divergent changesets
@@ -268,8 +268,8 @@
   rebasing to destination parent: b1661037fa25
   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 watwat > c
   $ hg resolve -m
@@ -284,8 +284,8 @@
   rebasing to destination parent: ca1b80f7960a
   merging c
   warning: conflicts while merging c! (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]
 
   $ hg evolve --abort
   1 new phase-divergent changesets
evolve