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-content-divergent-corner-cases.t
changeset 4676 b6c819facbe8
parent 4633 61c2518cd6d2
child 4784 ecf0f3bc7468
child 4991 2928f35023a1 
--- a/tests/test-evolve-content-divergent-corner-cases.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Jun 06 17:37:42 2019 +0800
@@ -277,7 +277,8 @@
   rebasing "other" content-divergent changeset de4ea3103326 on 9150fe93bec6
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg diff --no-git --config diff.unified=3
evolve