Mercurial > evolve

changeset 5822:bf303f93a461 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset ab2c56cdfc19
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:06:42 +0800
parents 84da58ad69a1
children fd039a7f0c3c 6fc0fb7105c2
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	Thu Mar 11 12:06:41 2021 +0800
+++ b/tests/test-prev-next.t	Thu Mar 11 12:06:42 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')