Mercurial > public > mercurial-scm > hg-stable
diff tests/test-resolve.t @ 38896:96d0795bd0bd
resolve: graduate resolve.mark-check from experimental, add docs
Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.
Differential Revision: https://phab.mercurial-scm.org/D4071
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:57:44 -0700 |
| parents | f8732e33bcbc |
| children | db03e5cefc82 |
line wrap: on
line diff
--- a/tests/test-resolve.t Mon Apr 16 23:49:38 2018 -0700 +++ b/tests/test-resolve.t Fri Aug 03 12:57:44 2018 -0700 @@ -383,7 +383,7 @@ U file1 U file2 $ echo 'remove markers' > file1 - $ hg --config experimental.resolve.mark-check=abort resolve -m + $ hg --config commands.resolve.mark-check=abort resolve -m warning: the following files still have conflict markers: file2 abort: conflict markers detected @@ -393,7 +393,7 @@ U file1 U file2 Try with --all from the hint - $ hg --config experimental.resolve.mark-check=abort resolve -m --all + $ hg --config commands.resolve.mark-check=abort resolve -m --all warning: the following files still have conflict markers: file2 (no more unresolved files) @@ -404,7 +404,7 @@ $ hg resolve -l U file1 U file2 - $ hg --config experimental.resolve.mark-check=warn resolve -m + $ hg --config commands.resolve.mark-check=warn resolve -m warning: the following files still have conflict markers: file2 (no more unresolved files) @@ -416,7 +416,7 @@ $ hg resolve -l U file1 R file2 - $ hg --config experimental.resolve.mark-check=warn resolve -m + $ hg --config commands.resolve.mark-check=warn resolve -m (no more unresolved files) $ hg resolve -l R file1