4022 force = opts.get('force') |
4022 force = opts.get('force') |
4023 labels = ['working copy', 'merge rev'] |
4023 labels = ['working copy', 'merge rev'] |
4024 return hg.merge(repo, node, force=force, mergeforce=force, |
4024 return hg.merge(repo, node, force=force, mergeforce=force, |
4025 labels=labels, abort=abort) |
4025 labels=labels, abort=abort) |
4026 |
4026 |
|
4027 statemod.addunfinished( |
|
4028 'merge', fname=None, clearable=True, allowcommit=True, |
|
4029 cmdmsg=_('outstanding uncommitted merge'), abortfunc=hg.abortmerge, |
|
4030 statushint=_('To continue: hg commit\n' |
|
4031 'To abort: hg merge --abort'), |
|
4032 cmdhint=_("use 'hg commit' or 'hg merge --abort'") |
|
4033 ) |
|
4034 |
4027 @command('outgoing|out', |
4035 @command('outgoing|out', |
4028 [('f', 'force', None, _('run even when the destination is unrelated')), |
4036 [('f', 'force', None, _('run even when the destination is unrelated')), |
4029 ('r', 'rev', [], |
4037 ('r', 'rev', [], |
4030 _('a changeset intended to be included in the destination'), _('REV')), |
4038 _('a changeset intended to be included in the destination'), _('REV')), |
4031 ('n', 'newest-first', None, _('show newest record first')), |
4039 ('n', 'newest-first', None, _('show newest record first')), |