Show More
@@ -1026,8 +1026,7 b' def rebase(ui, repo, **opts):' | |||
|
1026 | 1026 | raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action) |
|
1027 | 1027 | if confirm and action: |
|
1028 | 1028 | raise error.Abort(_(b'cannot specify both --confirm and --%s') % action) |
|
1029 | if dryrun and confirm: | |
|
1030 | raise error.Abort(_(b'cannot specify both --confirm and --dry-run')) | |
|
1029 | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') | |
|
1031 | 1030 | |
|
1032 | 1031 | if action or repo.currenttransaction() is not None: |
|
1033 | 1032 | # in-memory rebase is not compatible with resuming rebases. |
General Comments 0
You need to be logged in to leave comments.
Login now