Mercurial > hg
comparison mercurial/help/config.txt @ 29060:db74d95299af
help: wrap ".orig" in rst quotes
Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to
silence lintian warnings.
| author | Sean Farley <sean@farley.io> |
|---|---|
| date | Sat, 30 Apr 2016 18:40:34 -0700 |
| parents | d813132ea361 |
| children | 29a7d591ff42 |
comparison
equal
deleted
inserted
replaced
| 29059:8eba4cdcfd81 | 29060:db74d95299af |
|---|---|
| 1018 ``checkignored`` | 1018 ``checkignored`` |
| 1019 Controls behavior when an ignored file on disk has the same name as a tracked | 1019 Controls behavior when an ignored file on disk has the same name as a tracked |
| 1020 file in the changeset being merged or updated to, and has different | 1020 file in the changeset being merged or updated to, and has different |
| 1021 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, | 1021 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, |
| 1022 abort on such files. With ``warn``, warn on such files and back them up as | 1022 abort on such files. With ``warn``, warn on such files and back them up as |
| 1023 .orig. With ``ignore``, don't print a warning and back them up as | 1023 ``.orig``. With ``ignore``, don't print a warning and back them up as |
| 1024 .orig. (default: ``abort``) | 1024 ``.orig``. (default: ``abort``) |
| 1025 | 1025 |
| 1026 ``checkunknown`` | 1026 ``checkunknown`` |
| 1027 Controls behavior when an unknown file that isn't ignored has the same name | 1027 Controls behavior when an unknown file that isn't ignored has the same name |
| 1028 as a tracked file in the changeset being merged or updated to, and has | 1028 as a tracked file in the changeset being merged or updated to, and has |
| 1029 different contents. Similar to ``merge.checkignored``, except for files that | 1029 different contents. Similar to ``merge.checkignored``, except for files that |