diff -r 88609cfa3745 -r 9960b6369e7f mercurial/commands.py --- a/mercurial/commands.py Wed Jan 27 09:07:28 2016 -0800 +++ b/mercurial/commands.py Sat Jan 30 18:00:11 2016 +0900 @@ -598,6 +598,8 @@ def _dobackout(ui, repo, node=None, rev=None, **opts): if opts.get('commit') and opts.get('no_commit'): raise error.Abort(_("cannot use --commit with --no-commit")) + if opts.get('merge') and opts.get('no_commit'): + raise error.Abort(_("cannot use --merge with --no-commit")) if rev and node: raise error.Abort(_("please specify just one revision"))