diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-03-08 20:47:06 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-08 13:22:55 -0800 |
| commit | caa99829a24bc4decf86278c3478c88f564a795a (patch) | |
| tree | 2b7641d62aab7aeeba8fd108a5d4a97dc0f20c2f /t/t6024-recursive-merge.sh | |
| parent | git-mergetool documentaiton: show toolnames in typewriter font (diff) | |
| download | tgif-caa99829a24bc4decf86278c3478c88f564a795a.tar.xz | |
merge-tool documentation: describe custom command usage
The configuration variables for custom merge tools were documented
only in config.txt but there was no reference to the functionality in
git-mergetool.txt.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions