Show More
@@ -4158,7 +4158,8 b' def manifest(ui, repo, node=None, rev=No' | |||
|
4158 | 4158 | fm.end() |
|
4159 | 4159 | |
|
4160 | 4160 | @command('^merge', |
|
4161 | [('f', 'force', None, _('force a merge with outstanding changes')), | |
|
4161 | [('f', 'force', None, | |
|
4162 | _('force a merge including outstanding changes (DEPRECATED)')), | |
|
4162 | 4163 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4163 | 4164 | ('P', 'preview', None, |
|
4164 | 4165 | _('review revisions to merge (no merge is performed)')) |
General Comments 0
You need to be logged in to leave comments.
Login now