Mercurial > evolve

diff tests/test-evolve-public-content-divergent-corner-cases.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 b62ed7c69561
children 88c8ef4d703c
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Jun 07 02:25:02 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Jun 06 17:37:42 2019 +0800
@@ -389,7 +389,8 @@
   rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be
   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]
 
   $ hg diff
@@ -419,7 +420,8 @@
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  fix conflicts and see `hg help evolve.interrupted`
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
   [1]
 
   $ hg sum