From: Johannes Schindelin 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: https://git.lorimer.id.au/gitweb.git/diff_plain/6ea9c7eb2713d55f9af7522e878e6912972bb889 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 866e0534b8..7ee97df8a7 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::