[PATCH] Fix typo in config.txt
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:37
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
There was an 'l' (ell) instead of a '1' (one) in one of the gitlinks. Signed-off-by: Johannes Schindelin <redacted> --- Documentation/config.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 328487b..6b2fc82 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -599,7 +599,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::
--
1.5.3.3.1147.g47f44