Mercurial > evolve

diff tests/test-issue-5720.t @ 3852:629558d09898

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: raise error.InterventionRequired instead of Abort when conflicts error.InterventionRequired is a better error to raise in such cases. Thanks to marmoute for noticing this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 00:16:29 +0530
parents f0096db2a7b1
children d00f0c369bc7 bcd52ce0916d
line wrap: on
line diff
--- a/tests/test-issue-5720.t	Thu Jun 14 02:58:30 2018 +0200
+++ b/tests/test-issue-5720.t	Fri Jun 15 00:16:29 2018 +0530
@@ -61,8 +61,8 @@
   atop:[3] b
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  abort: fix conflicts and see `hg help evolve.interrupted`
-  [255]
+  fix conflicts and see `hg help evolve.interrupted`
+  [1]
 
 Fix the conflict
   $ echo c2 > a