Mercurial > evolve

diff tests/test-evolve-orphan-merge.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents 8e4f6354b316
children f804b78e9ee5 c0921b5277a0
line wrap: on
line diff
--- a/tests/test-evolve-orphan-merge.t	Sat Apr 24 19:54:14 2021 +0800
+++ b/tests/test-evolve-orphan-merge.t	Sat Apr 24 20:01:39 2021 +0800
@@ -210,7 +210,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo FOObar > c
   $ hg resolve -m
@@ -266,7 +266,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo foobar > c
   $ hg resolve -m