Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-parameters.t @ 43899:fff21278554b
rebase: use cmdutil.check_at_most_one_arg() for action
Here we also needed to know what the action was (if any), so I've
updated the helper to return any specified option.
Differential Revision: https://phab.mercurial-scm.org/D7640
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Dec 2019 15:55:33 -0800 |
| parents | 8197b395710e |
| children | 08b8bf4a8516 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Thu Dec 12 22:30:59 2019 -0800 +++ b/tests/test-rebase-parameters.t Thu Dec 12 15:55:33 2019 -0800 @@ -61,7 +61,7 @@ [1] $ hg rebase --continue --abort - abort: cannot use --abort with --continue + abort: cannot specify both --abort and --continue [255] $ hg rebase --continue --collapse