Mercurial > evolve

changeset 5890:73167c42e601 mercurial-5.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset 7e2d3952a730
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 19:53:59 +0800
parents 74aebf0b18f8
children b13cb2d500ae
files tests/test-prev-next.t
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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')