equal
deleted
inserted
replaced
1004 |
1004 |
1005 ``always`` |
1005 ``always`` |
1006 Optional. Always use the proxy, even for localhost and any entries |
1006 Optional. Always use the proxy, even for localhost and any entries |
1007 in ``http_proxy.no``. (default: False) |
1007 in ``http_proxy.no``. (default: False) |
1008 |
1008 |
|
1009 ``merge`` |
|
1010 --------- |
|
1011 |
|
1012 This section specifies behavior during merges and updates. |
|
1013 |
|
1014 ``checkignored`` |
|
1015 Controls behavior when an ignored file on disk has the same name as a tracked |
|
1016 file in the changeset being merged or updated to, and has different |
|
1017 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, |
|
1018 abort on such files. With ``warn``, warn on such files and back them up as |
|
1019 .orig. With ``ignore``, don't print a warning and back them up as |
|
1020 .orig. (default: ``abort``) |
|
1021 |
|
1022 ``checkunknown`` |
|
1023 Controls behavior when an unknown file that isn't ignored has the same name |
|
1024 as a tracked file in the changeset being merged or updated to, and has |
|
1025 different contents. Similar to ``merge.checkignored``, except for files that |
|
1026 are not ignored. (default: ``abort``) |
|
1027 |
1009 ``merge-patterns`` |
1028 ``merge-patterns`` |
1010 ------------------ |
1029 ------------------ |
1011 |
1030 |
1012 This section specifies merge tools to associate with particular file |
1031 This section specifies merge tools to associate with particular file |
1013 patterns. Tools matched here will take precedence over the default |
1032 patterns. Tools matched here will take precedence over the default |