summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e1a2ac)
raw | patch | inline | side by side (parent: 9e1a2ac)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Tue, 2 Oct 2007 20:14:30 +0000 (21:14 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 2 Oct 2007 22:26:57 +0000 (15:26 -0700) |
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>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt | patch | blob | history |
index 866e0534b8843af3c1789becd06b244162632d01..7ee97df8a70cd6c6b127d7d32f5e325acc405c98 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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::