diff tests/test-pick.t @ 5666:e5d91fd1f319

tests: update with more detailed exit codes

CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
CORE-TEST-OUTPUT-UPDATE: ebee234d952a
CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
CORE-TEST-OUTPUT-UPDATE: 96ca817ec192

--- a/tests/test-pick.t	Mon Nov 16 13:08:08 2020 -0800
+++ b/tests/test-pick.t	Thu Nov 19 08:28:45 2020 -0800
@@ -90,7 +90,7 @@
 #if abortcommand
   $ hg abort
   abort: no operation in progress
-  [255]
+  [20]
 #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)
-  [1]
+  [240]
 
   $ 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)
-  [1]
+  [240]
   $ 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)
-  [1]
+  [240]
 
 #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)
-  [1]
+  [240]
 
   $ 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)
-  [1]
+  [240]
   $ hg resolve -t :other a
   (no more unresolved files)
   continue: hg pick --continue