Mercurial > evolve

diff tests/test-evolve-content-divergent-basic.t @ 5666:e5d91fd1f319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents e8660b28bfee
children 8e4f6354b316 a1dad44fe3da
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-basic.t	Mon Nov 16 13:08:08 2020 -0800
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Nov 19 08:28:45 2020 -0800
@@ -344,7 +344,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo foobar > d
   $ hg resolve -m
@@ -404,7 +404,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ echo watbar > d
   $ hg resolve -m
@@ -615,7 +615,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [1]
+  [240]
 
   $ cat > a <<EOF
   > jungle