comparison mercurial/help/config.txt @ 21527:1f05a7bcde50

help: add local/other description to merge tool description

Adds a more detailed description of what 'local' and 'other' mean to the merge
tool documentation.

21526:3b40e32e88c3

  Default: the tool name.

``args``
  The arguments to pass to the tool executable. You can refer to the
  files being merged as well as the output file through these
  variables: ``$base``, ``$local``, ``$other``, ``$output``.
  Default: ``$local $base $other``

``premerge``
  Attempt to run internal non-interactive 3-way merge tool before
  launching external tool.  Options are ``true``, ``false``, or ``keep``

21527:1f05a7bcde50

  Default: the tool name.

``args``
  The arguments to pass to the tool executable. You can refer to the
  files being merged as well as the output file through these
  variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning
  of ``$local`` and ``$other`` can vary depending on which action is being
  performed. During and update or merge, ``$local`` represents the original
  state of the file, while ``$other`` represents the commit you are updating
  to or the commit you are merging with. During a rebase ``$local``
  represents the destination of the rebase, and ``$other`` represents the
  commit being rebased.
  Default: ``$local $base $other``

``premerge``
  Attempt to run internal non-interactive 3-way merge tool before
  launching external tool.  Options are ``true``, ``false``, or ``keep``