Mercurial > evolve

diff tests/test-evolve-progress.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 194adaeb84e8
children f162cafc5000
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-progress.t	Thu Jun 06 17:37:42 2019 +0800
@@ -135,7 +135,8 @@
   picked tool ':merge' for a (binary False symlink False changedelete False)
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
   $ echo resolved > a
   $ hg resolve -m a