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-orphan-merge.t
changeset 3843 f0096db2a7b1
parent 3821 f67ac33c07d2
child 3852 629558d09898 
--- a/tests/test-evolve-orphan-merge.t	Tue Jun 12 04:01:19 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t	Tue Jun 12 19:00:12 2018 +0530
@@ -219,9 +219,7 @@
   atop:[11] foo to c
   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
@@ -276,9 +274,7 @@
   atop:[13] foo to c
   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
evolve