Mercurial > evolve

diff tests/test-issue-5720.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 8e4f6354b316
children
line wrap: on
line diff
--- a/tests/test-issue-5720.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-issue-5720.t	Tue Feb 22 08:19:44 2022 +0300
@@ -63,7 +63,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 Fix the conflict
   $ echo c2 > a