Mercurial > public > mercurial-scm > hg-stable
diff tests/test-commit-unresolved.t @ 44249:75c2ca094d3a
merge: use check_incompatible_arguments() for --abort
Differential Revision: https://phab.mercurial-scm.org/D7993
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 15:07:44 -0800 |
| parents | 3bc400ccbf99 |
| children | 8d72e29ad1e0 |
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t Wed Jan 15 17:15:45 2020 -0800 +++ b/tests/test-commit-unresolved.t Fri Jan 24 15:07:44 2020 -0800 @@ -60,7 +60,7 @@ abort: cannot specify a node with --abort [255] $ hg merge --abort --rev e4501 - abort: cannot specify both --rev and --abort + abort: cannot specify both --abort and --rev [255] #if abortcommand @@ -144,7 +144,7 @@ (branch merge, don't forget to commit) $ hg merge --preview --abort - abort: cannot specify --preview with --abort + abort: cannot specify both --abort and --preview [255] $ hg abort