diff tests/test-pick.t @ 6065:c0921b5277a0 mercurial-5.6

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

# no-check-commit

--- a/tests/test-pick.t	Tue Oct 12 11:15:44 2021 +0300
+++ b/tests/test-pick.t	Tue Oct 12 11:32:36 2021 +0300
@@ -90,7 +90,7 @@
 #if abortcommand
   $ hg abort
   abort: no operation in progress
-  [20]
+  [255]
 #endif
 
 Specifying both continue and revs
@@ -197,7 +197,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
@@ -235,7 +235,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)
@@ -260,7 +260,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
@@ -320,7 +320,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
@@ -459,7 +459,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