diff tests/test-fixup.t @ 6250:35523be9534a mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6

--- a/tests/test-fixup.t	Mon Apr 25 22:05:30 2022 +0400
+++ b/tests/test-fixup.t	Mon Apr 25 22:14:16 2022 +0400
@@ -175,7 +175,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff --git a/foo b/foo
@@ -208,7 +208,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   fixup aborted
@@ -221,7 +221,7 @@
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg status --verbose
   M foo
@@ -364,7 +364,7 @@
       --abort    abort an interrupted fixup
   
   (use 'hg fixup -h' to show more help)
-  [10]
+  [255]
 
   $ hg fixup :10 -r 5
   abort: please specify just one revision