comparison doc/hgrc.5.txt @ 12771:c77f6276c9e7

help: help topic for merge tools

I have made a help topic for merge tools. The text in the topic is
based on the http://mercurial.selenic.com/wiki/MergeProgram page from
the wiki, along with some extra information on the internal merge tools.

12770:614f0d8724ab

    Allow to prompt the user. True or False. Default is True.
``logtemplate``
    Template string for commands that print changesets.
``merge``
    The conflict resolution program to use during a manual merge.
    There are some internal tools available:

    ``internal:local``
        keep the local version
    ``internal:other``
        use the other version
    ``internal:merge``
        use the internal non-interactive merge tool
    ``internal:fail``
        fail to merge

For more information on configuring merge tools see the
merge-tools_ section.

``patch``
    command to use to apply patches. Look for ``gpatch`` or ``patch`` in
    PATH if unset.
``quiet``
    Reduce the amount of output printed. True or False. Default is False.

12771:c77f6276c9e7

    Allow to prompt the user. True or False. Default is True.
``logtemplate``
    Template string for commands that print changesets.
``merge``
    The conflict resolution program to use during a manual merge.
    For more information on merge tools see :hg:`help merge-tools`.
    For configuring merge tools see the merge-tools_ section.
``patch``
    command to use to apply patches. Look for ``gpatch`` or ``patch`` in
    PATH if unset.
``quiet``
    Reduce the amount of output printed. True or False. Default is False.