Mercurial > hg
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.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 16 May 2014 13:15:07 -0700 |
parents | 25d5a9ecbb85 |
children | 10abc3a5c6b2 |
comparison
equal
deleted
inserted
replaced
21526:3b40e32e88c3 | 21527:1f05a7bcde50 |
---|---|
841 Default: the tool name. | 841 Default: the tool name. |
842 | 842 |
843 ``args`` | 843 ``args`` |
844 The arguments to pass to the tool executable. You can refer to the | 844 The arguments to pass to the tool executable. You can refer to the |
845 files being merged as well as the output file through these | 845 files being merged as well as the output file through these |
846 variables: ``$base``, ``$local``, ``$other``, ``$output``. | 846 variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning |
847 of ``$local`` and ``$other`` can vary depending on which action is being | |
848 performed. During and update or merge, ``$local`` represents the original | |
849 state of the file, while ``$other`` represents the commit you are updating | |
850 to or the commit you are merging with. During a rebase ``$local`` | |
851 represents the destination of the rebase, and ``$other`` represents the | |
852 commit being rebased. | |
847 Default: ``$local $base $other`` | 853 Default: ``$local $base $other`` |
848 | 854 |
849 ``premerge`` | 855 ``premerge`` |
850 Attempt to run internal non-interactive 3-way merge tool before | 856 Attempt to run internal non-interactive 3-way merge tool before |
851 launching external tool. Options are ``true``, ``false``, or ``keep`` | 857 launching external tool. Options are ``true``, ``false``, or ``keep`` |