diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-10-02 20:14:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-02 22:26:57 (GMT) |
| commit | 6ea9c7eb2713d55f9af7522e878e6912972bb889 (patch) | |
| tree | b04e494a8529dcd1a06a5c03cb7a3ffd6a63c5f2 /Documentation/config.txt | |
| parent | 9e1a2acfb2198e29c90b59eef84eb0370ef9f03f (diff) | |
| download | git-6ea9c7eb2713d55f9af7522e878e6912972bb889.zip git-6ea9c7eb2713d55f9af7522e878e6912972bb889.tar.gz git-6ea9c7eb2713d55f9af7522e878e6912972bb889.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 866e053..7ee97df 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:: |