Mercurial > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Valentin Gatien-Baron <vgatien-baron@janestreet.com>
date Tue, 14 Apr 2020 19:09:56 -0400
parents 34a46d48d24e
children 8d72e29ad1e0
line wrap: on
line diff
--- a/tests/test-bisect.t	Fri Apr 10 19:58:34 2020 +0200
+++ b/tests/test-bisect.t	Tue Apr 14 19:09:56 2020 -0400
@@ -564,7 +564,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
-  [255]
+  [1]
   $ hg bisect --reset
   $ hg up -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved