Mercurial > hg-stable
changeset 28023:b7bf2b0731be
merge: document checkignored and checkunknown configs again
These options were undocumented for 3.7 because of an issue found during the
freeze (see rev 7cb7264cfd52). This issue has now been fixed, so we can
document these options again.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 01 Feb 2016 20:28:32 -0800 |
| parents | e397b58c0563 |
| children | 142891ab6e89 |
| files | mercurial/help/config.txt |
| diffstat | 1 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/config.txt Wed Feb 03 13:12:06 2016 -0800 +++ b/mercurial/help/config.txt Mon Feb 01 20:28:32 2016 -0800 @@ -1006,6 +1006,25 @@ Optional. Always use the proxy, even for localhost and any entries in ``http_proxy.no``. (default: False) +``merge`` +--------- + +This section specifies behavior during merges and updates. + +``checkignored`` + Controls behavior when an ignored file on disk has the same name as a tracked + file in the changeset being merged or updated to, and has different + contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, + abort on such files. With ``warn``, warn on such files and back them up as + .orig. With ``ignore``, don't print a warning and back them up as + .orig. (default: ``abort``) + +``checkunknown`` + Controls behavior when an unknown file that isn't ignored has the same name + as a tracked file in the changeset being merged or updated to, and has + different contents. Similar to ``merge.checkignored``, except for files that + are not ignored. (default: ``abort``) + ``merge-patterns`` ------------------