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 3796 ededd22e7c7b
parent 3702 f6979d64b9fb
child 3821 f67ac33c07d2 
--- a/tests/test-evolve-continue.t	Wed May 23 01:11:59 2018 +0530
+++ b/tests/test-evolve-continue.t	Wed Jun 06 04:09:49 2018 +0530
@@ -59,7 +59,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]
 
@@ -118,7 +118,7 @@
   merging e
   warning: conflicts while merging e! (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]
 
@@ -159,7 +159,7 @@
   merging b
   warning: conflicts while merging b! (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]
 
@@ -247,7 +247,7 @@
   merging f
   warning: conflicts while merging f! (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]
 
@@ -264,7 +264,7 @@
   merging h
   warning: conflicts while merging h! (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]
 
@@ -312,7 +312,7 @@
   merging g
   warning: conflicts while merging g! (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]
 
@@ -364,7 +364,7 @@
   merging g
   warning: conflicts while merging g! (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 > g
evolve