Mercurial > hg

diff tests/test-backout.t @ 45739:693da1b928af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: leverage cmdutil.check_incompatible_arguments() Differential Revision: https://phab.mercurial-scm.org/D9216
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 15 Oct 2020 21:44:03 -0700
parents acbfa31cfaf2
children e0ad11ab8052
line wrap: on
line diff
--- a/tests/test-backout.t	Mon Oct 12 12:52:45 2020 -0700
+++ b/tests/test-backout.t	Thu Oct 15 21:44:03 2020 -0700
@@ -804,5 +804,5 @@
 --no-commit can't be used with --merge
 
   $ hg backout --merge --no-commit 2
-  abort: cannot use --merge with --no-commit
+  abort: cannot specify both --no-commit and --merge
   [255]