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