Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-interruptions.t @ 36928:9457c395fcbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix issue 5494 also with --collapse Differential Revision: https://phab.mercurial-scm.org/D2759
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 08 Mar 2018 14:17:24 -0800
parents 66c569e57c70
children e9e61fbac787
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t	Fri Mar 09 10:35:48 2018 -0800
+++ b/tests/test-rebase-interruptions.t	Thu Mar 08 14:17:24 2018 -0800
@@ -479,7 +479,6 @@
   $ hg rebase --continue
   rebasing 2:fdaca8533b86 "b" (tip)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
-BROKEN: the merge state was not cleared
   $ hg resolve --list
-  R a
   $ test -d .hg/merge
+  [1]