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 4676 b6c819facbe8
parent 4613 30a544904238
child 4916 4101fab78314
child 5097 f0c18ad24273
child 5245 207427ed9302 
--- a/tests/test-evolve-orphan-merge.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-orphan-merge.t	Thu Jun 06 17:37:42 2019 +0800
@@ -219,7 +219,8 @@
   atop:[11] foo to c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ echo FOObar > c
@@ -274,7 +275,8 @@
   atop:[13] foo to c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ echo foobar > c
evolve