# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1606874133 -28800
# Node ID ed7ff9c0a940d63a8a0d4b1c594aef09dd6c7ac3
# Parent  12c53d7122a7d694b243848407e5983aff6588d0
tests: update exit code in case of unresolved merge conflicts

CORE-TEST-OUTPUT-UPDATE: fa87536d3d70

diff -r 12c53d7122a7 -r ed7ff9c0a940 tests/test-evolve-issue5966.t
--- a/tests/test-evolve-issue5966.t	Wed Dec 02 09:40:33 2020 +0800
+++ b/tests/test-evolve-issue5966.t	Wed Dec 02 09:55:33 2020 +0800
@@ -73,13 +73,13 @@
   U a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 (even when ran twice)
 
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
   $ cat a
   apricot
diff -r 12c53d7122a7 -r ed7ff9c0a940 tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Wed Dec 02 09:40:33 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