--- a/mercurial/commands.py Wed Jan 15 17:15:45 2020 -0800
+++ b/mercurial/commands.py Fri Jan 24 15:07:44 2020 -0800
@@ -4847,6 +4847,7 @@
abort = opts.get(b'abort')
if abort and repo.dirstate.p2() == nullid:
cmdutil.wrongtooltocontinue(repo, _(b'merge'))
+ cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')
if abort:
state = cmdutil.getunfinishedstate(repo)
if state and state._opname != b'merge':
@@ -4856,10 +4857,6 @@
)
if node:
raise error.Abort(_(b"cannot specify a node with --abort"))
- if opts.get(b'rev'):
- raise error.Abort(_(b"cannot specify both --rev and --abort"))
- if opts.get(b'preview'):
- raise error.Abort(_(b"cannot specify --preview with --abort"))
if opts.get(b'rev') and node:
raise error.Abort(_(b"please specify just one revision"))
if not node: