Show More
@@ -769,11 +769,8 b' def backout(ui, repo, node=None, rev=Non' | |||
|
769 | 769 | |
|
770 | 770 | |
|
771 | 771 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
772 | cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge']) | |
|
772 | 773 | opts = pycompat.byteskwargs(opts) |
|
773 | if opts.get(b'commit') and opts.get(b'no_commit'): | |
|
774 | raise error.Abort(_(b"cannot use --commit with --no-commit")) | |
|
775 | if opts.get(b'merge') and opts.get(b'no_commit'): | |
|
776 | raise error.Abort(_(b"cannot use --merge with --no-commit")) | |
|
777 | 774 | |
|
778 | 775 | if rev and node: |
|
779 | 776 | raise error.Abort(_(b"please specify just one revision")) |
General Comments 0
You need to be logged in to leave comments.
Login now