equal
deleted
inserted
replaced
5512 raise util.Abort(_('uncommitted merge with no revision specified'), |
5512 raise util.Abort(_('uncommitted merge with no revision specified'), |
5513 hint=_('use "hg update" or see "hg help revert"')) |
5513 hint=_('use "hg update" or see "hg help revert"')) |
5514 |
5514 |
5515 ctx = scmutil.revsingle(repo, opts.get('rev')) |
5515 ctx = scmutil.revsingle(repo, opts.get('rev')) |
5516 |
5516 |
5517 if not pats and not opts.get('all'): |
5517 if not pats and not (opts.get('all') or opts.get('interactive')): |
5518 msg = _("no files or directories specified") |
5518 msg = _("no files or directories specified") |
5519 if p2 != nullid: |
5519 if p2 != nullid: |
5520 hint = _("uncommitted merge, use --all to discard all changes," |
5520 hint = _("uncommitted merge, use --all to discard all changes," |
5521 " or 'hg update -C .' to abort the merge") |
5521 " or 'hg update -C .' to abort the merge") |
5522 raise util.Abort(msg, hint=hint) |
5522 raise util.Abort(msg, hint=hint) |