Mercurial > evolve

diff tests/test-evolve-inmemory.t @ 6181:e6ae5af97683 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 Tue, 22 Feb 2022 08:19:44 +0300
parents fd039a7f0c3c
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-inmemory.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-evolve-inmemory.t	Tue Feb 22 08:19:44 2022 +0300
@@ -70,7 +70,7 @@
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ hg glog
   @  6:a2a0434af50b draft tip
   |  C