comparison mercurial/help/config.txt @ 25649:e90e031b3016

doc: document the ui.patch option This option has been undocumented since e56c7e05c7e6 (July 2007).
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Tue, 23 Jun 2015 13:47:42 -0400
parents 2748bf78a5bf
children 5cda0ce05c42
comparison
equal deleted inserted replaced
25648:9b9877d2b229 25649:e90e031b3016
1449 specified by the ``--encoding`` global option, ``HGENCODING`` or other 1449 specified by the ``--encoding`` global option, ``HGENCODING`` or other
1450 environment variables that govern your locale. If the encoding of the merge 1450 environment variables that govern your locale. If the encoding of the merge
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``.
1457 If set to ``warn`` (or ``true``), a warning message is printed on POSIX 1470 If set to ``warn`` (or ``true``), a warning message is printed on POSIX
1458 platforms, if a file with a non-portable filename is added (e.g. a file 1471 platforms, if a file with a non-portable filename is added (e.g. a file