# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1612437825 -28800
# Node ID 7e2d3952a730c4c91de6f84cee40885a915fb20b
# Parent  1682b388be13080a4d553928e59c87f0e129f993
tests: update more exit codes in case conflicting changes

CORE-TEST-OUTPUT-UPDATE: dc00324e80f4

diff -r 1682b388be13 -r 7e2d3952a730 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Thu Feb 04 19:21:28 2021 +0800
+++ b/tests/test-prev-next.t	Thu Feb 04 19:23:45 2021 +0800
@@ -431,7 +431,7 @@
   $ hg prev
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
 
   $ echo hi > bar
   $ hg prev
@@ -443,7 +443,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
 
 Test that --merge still works fine with commands.update.check set
 
@@ -454,7 +454,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')