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

CORE-TEST-OUTPUT-UPDATE: dc00324e80f4

diff -r ad80552c706c -r ab2c56cdfc19 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')