Mercurial > hg
diff hgext/rebase.py @ 9599:f3404b7f37ca
Merge with crew-stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 16 Oct 2009 00:45:18 +0200 |
| parents | 341182ac95e4 fdf0c375cdbf |
| children | 49efeed49c94 |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Oct 16 00:06:23 2009 +0200 +++ b/hgext/rebase.py Fri Oct 16 00:45:18 2009 +0200 @@ -464,9 +464,9 @@ ('s', 'source', '', _('rebase from a given revision')), ('b', 'base', '', _('rebase from the base of a given revision')), ('d', 'dest', '', _('rebase onto a given revision')), - ('', 'collapse', False, _('collapse the rebased revisions')), - ('', 'keep', False, _('keep original revisions')), - ('', 'keepbranches', False, _('keep original branches')), + ('', 'collapse', False, _('collapse the rebased changesets')), + ('', 'keep', False, _('keep original changesets')), + ('', 'keepbranches', False, _('keep original branch names')), ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase')),] + templateopts,