Mercurial > evolve

diff tests/test-evolve-phase-divergence.t @ 4676:b6c819facbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Jun 2019 17:37:42 +0800
parents d314deb12f08
children 5d50f3de4714 e50596ff2ddb
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Thu Jun 06 17:37:42 2019 +0800
@@ -807,7 +807,8 @@
   rebasing to destination parent: 8c2bb6fb44e9
   merging x
   warning: conflicts while merging x! (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