Mercurial > evolve

diff tests/test-evolve-phase.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 fd039a7f0c3c
children 9b1bdd68d545 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Sat Apr 24 19:54:14 2021 +0800
+++ b/tests/test-evolve-phase.t	Sat Apr 24 20:01:39 2021 +0800
@@ -97,7 +97,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg diff
   diff -r 87495ea7c9ec a