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-orphan.t
changeset 3821 f67ac33c07d2
parent 3796 ededd22e7c7b
child 3839 ac0717f23921 
--- a/tests/test-evolve-abort-orphan.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-abort-orphan.t	Mon Jun 11 01:12:12 2018 +0530
@@ -86,7 +86,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -120,7 +120,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ echo foo > d
@@ -150,7 +150,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -245,7 +245,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -311,7 +311,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg glog
@@ -390,7 +390,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -468,7 +468,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -516,7 +516,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
evolve