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-contentdiv.t
changeset 3842 b293cce4ff55
parent 3841 82b79a8dafd9
child 3846 f9dad99a90d5 
--- a/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 04:01:19 2018 +0530
@@ -78,7 +78,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg status -v
@@ -178,7 +178,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --abort
@@ -338,7 +338,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --abort
evolve