Mercurial > hg
diff tests/test-rebase-obsolete.t @ 43927:905b21783968
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
Differential Revision: https://phab.mercurial-scm.org/D7661
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 13 Dec 2019 14:50:42 -0800 |
| parents | fff21278554b |
| children | 412f199b4092 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Fri Dec 13 14:49:48 2019 -0800 +++ b/tests/test-rebase-obsolete.t Fri Dec 13 14:50:42 2019 -0800 @@ -2054,7 +2054,7 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg rebase --stop --dry-run - abort: cannot specify both --dry-run and --stop + abort: cannot specify both --stop and --dry-run [255] $ hg rebase -s 3 -d 5