print warning/error/fatal messages in one shot

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 866e0534b8843af3c1789becd06b244162632d01..7ee97df8a70cd6c6b127d7d32f5e325acc405c98 100644 (file)
--- 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::