# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1619265239 -28800
# Node ID 73167c42e60188c4c7af03fdb4b33702e11af11b
# Parent  74aebf0b18f81bdb023e706f57ce260eaf632d6a
test-compat: back out changeset 7e2d3952a730

diff -r 74aebf0b18f8 -r 73167c42e601 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sat Apr 24 19:53:12 2021 +0800
+++ b/tests/test-prev-next.t	Sat Apr 24 19:53:59 2021 +0800
@@ -431,7 +431,7 @@
   $ hg prev
   abort: conflicting changes
   (do you want --merge?)
-  [20]
+  [255]
 
   $ echo hi > bar
   $ hg prev
@@ -443,7 +443,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [20]
+  [255]
 
 Test that --merge still works fine with commands.update.check set
 
@@ -454,7 +454,7 @@
   $ hg next
   abort: conflicting changes
   (do you want --merge?)
-  [20]
+  [255]
   $ hg next --merge
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')