diff tests/test-pick.t @ 6181:e6ae5af97683 mercurial-5.6

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

--- a/tests/test-pick.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-pick.t	Tue Feb 22 08:19:44 2022 +0300
@@ -92,7 +92,7 @@
 #if abortcommand
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Specifying both continue and revs
@@ -199,7 +199,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
   $ echo foobar > c
   $ hg resolve --all --mark
@@ -237,7 +237,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ echo foobar > c
   $ hg resolve -m
   (no more unresolved files)
@@ -262,7 +262,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
 #if abortcommand
   $ hg abort --dry-run
@@ -323,7 +323,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
 
   $ echo bar > b
   $ hg resolve -m
@@ -462,7 +462,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ hg resolve -t :other a
   (no more unresolved files)
   continue: hg pick --continue