X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-mergetool.txt;h=a26c260162cf6cbab922dfd6320b1d440d7090ca;hb=33e12acafec40ac7c44629e22cf050e506bb0706;hp=5baaaca0b5433ae279b3961d72d0cffa8ca046e3;hpb=12d6697f3a9f07db0c437438804aec994fc34035;p=git.git

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 5baaaca0b..a26c26016 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -25,12 +25,18 @@ OPTIONS
 -t or --tool=<tool>::
 	Use the merge resolution program specified by <tool>.
 	Valid merge tools are:
-	kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
-
-	If a merge resolution program is not specified, 'git mergetool'
-	will use the configuration variable merge.tool.  If the
-	configuration variable merge.tool is not set, 'git mergetool'
-	will pick a suitable default.
+	kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
++
+If a merge resolution program is not specified, 'git mergetool'
+will use the configuration variable merge.tool.  If the
+configuration variable merge.tool is not set, 'git mergetool'
+will pick a suitable default.
++
+You can explicitly provide a full path to the tool by setting the
+configuration variable mergetool.<tool>.path. For example, you
+can configure the absolute path to kdiff3 by setting
+mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool
+is available in PATH.
 
 Author
 ------
@@ -43,4 +49,3 @@ Documentation by Theodore Y Ts'o.
 GIT
 ---
 Part of the gitlink:git[7] suite
-