Mercurial > evolve

diff tests/test-evolve-content-divergence.t @ 3853:796334340cad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make one missed error to align other error messages Previous patches missed this error to change it to the new format. Let's align this with all other messages raised by `hg evolve` command.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 00:50:17 +0530
parents 629558d09898
children 9cf45b94f977
line wrap: on
line diff
--- a/tests/test-evolve-content-divergence.t	Fri Jun 15 00:16:29 2018 +0530
+++ b/tests/test-evolve-content-divergence.t	Fri Jun 15 00:50:17 2018 +0530
@@ -668,8 +668,8 @@
   rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
-  abort: unresolved merge conflicts (see hg help resolve)
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
   $ hg diff
   diff -r 7bbcf24ddecf y