# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1579907264 28800
# Node ID 75c2ca094d3a6d9827d9ac19811396fdb2b73370
# Parent  1cb7ae9b00717a15a9c35a4309b8da9ae8c6895e
merge: use check_incompatible_arguments() for --abort

Differential Revision: https://phab.mercurial-scm.org/D7993

diff -r 1cb7ae9b0071 -r 75c2ca094d3a mercurial/commands.py
--- 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:
diff -r 1cb7ae9b0071 -r 75c2ca094d3a tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t	Wed Jan 15 17:15:45 2020 -0800
+++ b/tests/test-commit-unresolved.t	Fri Jan 24 15:07:44 2020 -0800
@@ -60,7 +60,7 @@
   abort: cannot specify a node with --abort
   [255]
   $ hg merge --abort --rev e4501
-  abort: cannot specify both --rev and --abort
+  abort: cannot specify both --abort and --rev
   [255]
 
 #if abortcommand
@@ -144,7 +144,7 @@
   (branch merge, don't forget to commit)
 
   $ hg merge --preview --abort
-  abort: cannot specify --preview with --abort
+  abort: cannot specify both --abort and --preview
   [255]
 
   $ hg abort