Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-parameters.t @ 43929:08b8bf4a8516
rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r
Differential Revision: https://phab.mercurial-scm.org/D7643
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 12 Dec 2019 22:43:15 -0800 |
parents | fff21278554b |
children | 8c87cc169946 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Thu Dec 12 23:11:33 2019 -0800 +++ b/tests/test-rebase-parameters.t Thu Dec 12 22:43:15 2019 -0800 @@ -73,14 +73,14 @@ [255] $ hg rebase --base 5 --source 4 - abort: cannot specify both a source and a base + abort: cannot specify both --source and --base [255] $ hg rebase --rev 5 --source 4 - abort: cannot specify both a revision and a source + abort: cannot specify both --rev and --source [255] $ hg rebase --base 5 --rev 4 - abort: cannot specify both a revision and a base + abort: cannot specify both --rev and --base [255] $ hg rebase --base 6