4156 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
4156 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
4157 fm.write('path', '%s\n', f) |
4157 fm.write('path', '%s\n', f) |
4158 fm.end() |
4158 fm.end() |
4159 |
4159 |
4160 @command('^merge', |
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 ('r', 'rev', '', _('revision to merge'), _('REV')), |
4163 ('r', 'rev', '', _('revision to merge'), _('REV')), |
4163 ('P', 'preview', None, |
4164 ('P', 'preview', None, |
4164 _('review revisions to merge (no merge is performed)')) |
4165 _('review revisions to merge (no merge is performed)')) |
4165 ] + mergetoolopts, |
4166 ] + mergetoolopts, |
4166 _('[-P] [-f] [[-r] REV]')) |
4167 _('[-P] [-f] [[-r] REV]')) |