Mercurial > hg-stable

diff hgext/rebase.py @ 19496:607191a45f8c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkunfinished: accommodate histedit quirk Turns out histedit actually intends for commits (but not other operations like update) to be possible during its operation.
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jul 2013 02:17:52 -0500
parents e5a5790a3185
children fe78eb7bcca0
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Jul 22 10:04:53 2013 +0200
+++ b/hgext/rebase.py	Thu Jul 25 02:17:52 2013 -0500
@@ -800,5 +800,5 @@
                      _("specify merge tool for rebase")))
     cmdutil.summaryhooks.add('rebase', summaryhook)
     cmdutil.unfinishedstates.append(
-        ['rebasestate', False, _('rebase in progress'),
+        ['rebasestate', False, False, _('rebase in progress'),
          _("use 'hg rebase --continue' or 'hg rebase --abort'")])