Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.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 34bba01a1355
children c3e9269d9602
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Thu Dec 24 20:46:06 2015 +0000
+++ b/tests/test-rebase-conflicts.t	Thu Dec 24 20:41:40 2015 +0000
@@ -83,6 +83,7 @@
   $ echo 'resolved merge' >common
   $ hg resolve -m common
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"