Mercurial > evolve

diff tests/test-unstability-resolution-result.t @ 5716:a4e50b74747e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update exit code in case of unresolved merge conflicts CORE-TEST-OUTPUT-UPDATE: fa87536d3d70
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 02 Dec 2020 09:55:33 +0800
parents b3d9e6c805d6
children 8e4f6354b316 a1dad44fe3da
line wrap: on
line diff
--- a/tests/test-unstability-resolution-result.t	Thu Nov 26 14:26:40 2020 +0800
+++ b/tests/test-unstability-resolution-result.t	Wed Dec 02 09:55:33 2020 +0800
@@ -104,7 +104,7 @@
   +newer a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg evolve --continue