From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 2 Oct 2007 20:14:30 +0000 (+0100)
Subject: Fix typo in config.txt
X-Git-Tag: v1.5.3.4~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ea9c7eb2713d55f9af7522e878e6912972bb889;p=git.git

Fix typo in config.txt

There was an 'l' (ell) instead of a '1' (one) in one of the gitlinks.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 866e0534b..7ee97df8a 100644
--- 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::