From: Charles Bailey <charles@hashpling.org>
Date: Sat, 8 Mar 2008 20:47:06 +0000 (+0000)
Subject: merge-tool documentation: describe custom command usage
X-Git-Tag: v1.5.5-rc0~51
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/caa99829a24bc4decf86278c3478c88f564a795a?ds=inline;hp=caa99829a24bc4decf86278c3478c88f564a795a

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>
---