diff tests/test-issue1175.t @ 44725:16c361152133

graft: exit 1 on conflicts, like merge

It's more consistent, and makes it nicer to script around hg if you
don't have to ignore exit code 255, which is the error code for
basically everything in hg.

Differential Revision: https://phab.mercurial-scm.org/D8423

--- a/tests/test-issue1175.t	Fri Apr 10 19:58:34 2020 +0200
+++ b/tests/test-issue1175.t	Tue Apr 14 19:09:56 2020 -0400
@@ -74,7 +74,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
-  [255]
+  [1]
   $ echo a > b
   $ echo b3 >> b
   $ hg resolve --mark b