Mercurial > hg
diff tests/test-merge1.t @ 45841:bff719525815
errors: set detailed exit code to 30 for config errors
This is per https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.
Differential Revision: https://phab.mercurial-scm.org/D9311
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 22 Oct 2020 13:56:01 -0700 |
parents | 527ce85c2e60 |
children | 9dc1351d0b5f |
line wrap: on
line diff
--- a/tests/test-merge1.t Mon Oct 12 12:44:18 2020 -0700 +++ b/tests/test-merge1.t Thu Oct 22 13:56:01 2020 -0700 @@ -139,7 +139,7 @@ bad config $ hg merge 1 --config merge.checkunknown=x abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn') - [255] + [30] this merge should fail $ hg merge 1 --config merge.checkunknown=abort b: untracked file differs