Mercurial > evolve

diff tests/test-prev-next.t @ 6180:0042d69b8648 mercurial-5.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.8 into mercurial-5.7
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:00:24 +0300
parents 28a77df6e41f
children 71e2408b77d0
line wrap: on
line diff
--- a/tests/test-prev-next.t	Tue Feb 22 07:51:36 2022 +0300
+++ b/tests/test-prev-next.t	Tue Feb 22 08:00:24 2022 +0300
@@ -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')