Mercurial > hg > mercurial-source

diff tests/test-histedit-fold.t @ 28282:dcbba68e076f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: hook afterresolvedstates
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 20:41:17 +0000
parents f209c85183a7
children e7ff83b2bcfe
line wrap: on
line diff
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -305,6 +305,7 @@
   $ hg revert -r 'p1()' file
   $ hg resolve --mark file
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue
   251d831eeec5: empty changeset
   saved backup bundle to $TESTTMP/*-backup.hg (glob)
@@ -364,6 +365,7 @@
   > EOF
   $ hg resolve --mark file
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg commit -m '+5.2'
   created new head
   $ echo 6 >> file