diff-merges: clarify log.diffMerges documentation

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index bc63bc3939c27d40969564657321866fe8236f21..5f96cf87fb96ce7366f11f80b48f9c9bf9fd13f6 100644 (file)
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -34,9 +34,9 @@ log.excludeDecoration::
        option.
 
 log.diffMerges::
-       Set default diff format to be used for merge commits. See
-       `--diff-merges` in linkgit:git-log[1] for details.
-       Defaults to `separate`.
+       Set diff format to be used when `--diff-merges=on` is
+       specified, see `--diff-merges` in linkgit:git-log[1] for
+       details. Defaults to `separate`.
 
 log.follow::
        If `true`, `git log` will act as if the `--follow` option was used when