Show More
@@ -1020,8 +1020,8 This section specifies behavior during m | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now