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>
Johannes Schindelin committed
Oct 2, 2007 at 21:14 UTC
6ea9c7eb2713d55f9af7522e878e6912972bb889
1 file changed
+1
-1
Documentation/config.txt
+1
-1
@@ -579,7 +579,7 @@ merge.summary::
579
580
merge.tool::
581
Controls which merge resolution program is used by
582
- gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
582
+ gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
583
"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
584
585
merge.verbosity::