Sync with GIT 1.5.3.4

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 015910f27a450cdaec80f3bfc2679243126736c0..f59fbb30248d9ac1f8e0d44364957359a3f152cb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -579,7 +579,7 @@ merge.summary::
 
 merge.tool::
        Controls which merge resolution program is used by
-       gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
+       gitlink:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
        "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
 
 merge.verbosity::