Show More
@@ -53,7 +53,6 b' from mercurial import (' | |||||
53 | ) |
|
53 | ) | |
54 |
|
54 | |||
55 | release = lock.release |
|
55 | release = lock.release | |
56 | templateopts = cmdutil.templateopts |
|
|||
57 |
|
56 | |||
58 | # The following constants are used throughout the rebase module. The ordering of |
|
57 | # The following constants are used throughout the rebase module. The ordering of | |
59 | # their values must be maintained. |
|
58 | # their values must be maintained. | |
@@ -594,7 +593,7 b' class rebaseruntime(object):' | |||||
594 | ('t', 'tool', '', _('specify merge tool')), |
|
593 | ('t', 'tool', '', _('specify merge tool')), | |
595 | ('c', 'continue', False, _('continue an interrupted rebase')), |
|
594 | ('c', 'continue', False, _('continue an interrupted rebase')), | |
596 | ('a', 'abort', False, _('abort an interrupted rebase'))] + |
|
595 | ('a', 'abort', False, _('abort an interrupted rebase'))] + | |
597 | templateopts, |
|
596 | cmdutil.formatteropts, | |
598 | _('[-s REV | -b REV] [-d REV] [OPTION]')) |
|
597 | _('[-s REV | -b REV] [-d REV] [OPTION]')) | |
599 | def rebase(ui, repo, **opts): |
|
598 | def rebase(ui, repo, **opts): | |
600 | """move changeset (and descendants) to a different branch |
|
599 | """move changeset (and descendants) to a different branch |
General Comments 0
You need to be logged in to leave comments.
Login now