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 3796 ededd22e7c7b
parent 3731 83dc216b9e9a
child 3821 f67ac33c07d2 
--- a/tests/test-evolve-stop-orphan.t	Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-evolve-stop-orphan.t	Wed Jun 06 04:09:49 2018 +0530
@@ -91,7 +91,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -139,7 +139,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -188,7 +188,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ echo foo > d
@@ -241,7 +241,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -280,7 +280,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -358,7 +358,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
+  see `hg help evolve.interrupted-evolve`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
evolve