Mercurial > evolve

diff tests/test-topic-rebase.t @ 5747:8e4f6354b316 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: back out changeset b3d9e6c805d6
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Jan 2021 18:48:36 +0800
parents 61d2f1cf90f0
children 03410b04cf10
line wrap: on
line diff
--- a/tests/test-topic-rebase.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-topic-rebase.t	Thu Jan 28 18:48:36 2021 +0800
@@ -128,7 +128,7 @@
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [240]
+  [1]
 
 Resolve the conflict
   $ echo A2 > file