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-stop-orphan.t
changeset 3843 f0096db2a7b1
parent 3821 f67ac33c07d2
child 3852 629558d09898 
--- a/tests/test-evolve-stop-orphan.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-stop-orphan.t	Tue Jun 12 19:00:12 2018 +0530
@@ -90,9 +90,7 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --stop
@@ -138,9 +136,7 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg diff
@@ -187,9 +183,7 @@
   atop:[5] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
   $ echo foo > d
   $ hg resolve -m
@@ -240,9 +234,7 @@
   atop:[9] added b
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg status
@@ -279,9 +271,7 @@
   atop:[9] added b
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ echo foobar > c
@@ -357,9 +347,7 @@
   atop:[13] added b
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  evolve failed!
-  see `hg help evolve.interrupted`
-  abort: unresolved merge conflicts (see hg help resolve)
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --stop
evolve