Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-check-restore.t @ 27626:157675d0f600

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: hook afterresolvedstates
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 20:41:40 +0000
parents ef1eb6df7071
children 3b7cb3d17137
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.t	Thu Dec 24 20:46:06 2015 +0000
+++ b/tests/test-rebase-check-restore.t	Thu Dec 24 20:41:40 2015 +0000
@@ -78,6 +78,7 @@
   $ rm A.orig
   $ hg resolve -m A
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   already rebased 1:27547f69f254 "B" as 45396c49d53b
   rebasing 2:965c486023db "C"
@@ -134,6 +135,7 @@
   $ rm A.orig
   $ hg resolve -m A
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 5:01e6ebbd8272 "F" (tip)
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)