Mercurial > evolve

diff tests/test-evolve-phase.t @ 6809:9903ee44e658 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 Wed, 26 Jun 2024 18:09:37 +0400
parents 1328195f76a9
children e5bd76f95145
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Wed Jun 26 16:24:32 2024 +0400
+++ b/tests/test-evolve-phase.t	Wed Jun 26 18:09:37 2024 +0400
@@ -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