diff tests/test-evolve-public-content-divergent-discard.t @ 5714:b3d9e6c805d6 stable

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-evolve-public-content-divergent-discard.t	Thu Jan 21 19:05:17 2021 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Thu Nov 19 08:28:45 2020 -0800
@@ -273,7 +273,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ hg diff
   diff -r f7c1071f1e7c ch
@@ -387,7 +387,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo c > c
   $ hg res -m
@@ -492,7 +492,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo dh > dh
   $ hg res -m
@@ -595,7 +595,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo c > c
   $ hg res -m
@@ -609,7 +609,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo dh > dh
   $ hg res -m