Show More
@@ -1451,6 +1451,19 b' User interface controls.' | |||||
1451 | markers is different from the encoding of the merged files, |
|
1451 | markers is different from the encoding of the merged files, | |
1452 | serious problems may occur. |
|
1452 | serious problems may occur. | |
1453 |
|
1453 | |||
|
1454 | ``patch`` | |||
|
1455 | An optional external tool that ``hg import`` and some extensions | |||
|
1456 | will use for applying patches. By default Mercurial uses an | |||
|
1457 | internal patch utility. The external tool must work as the common | |||
|
1458 | Unix ``patch`` program. In particular, it must accept a ``-p`` | |||
|
1459 | argument to strip patch headers, a ``-d`` argument to specify the | |||
|
1460 | current directory, a file name to patch, and a patch file to take | |||
|
1461 | from stdin. | |||
|
1462 | ||||
|
1463 | It is possible to specify a patch tool together with extra | |||
|
1464 | arguments. For example, setting this option to ``patch --merge`` | |||
|
1465 | will use the ``patch`` program with its 2-way merge option. | |||
|
1466 | ||||
1454 | ``portablefilenames`` |
|
1467 | ``portablefilenames`` | |
1455 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
|
1468 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. | |
1456 | Default is ``warn``. |
|
1469 | Default is ``warn``. |
General Comments 0
You need to be logged in to leave comments.
Login now