Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-conflicts.t @ 18935:e5d9441ec281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: exit with status 1 for an InterventionRequired exception (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:17:46 -0600
parents 42b620fc89e2
children ad9db007656f
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-conflicts.t	Fri Feb 08 16:17:46 2013 -0600
@@ -66,7 +66,7 @@
   warning: conflicts during merge.
   merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  [1]
 
 Try to continue without solving the conflict: