Merge branch 'nd/index-pack-threaded-fixes'

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e575fea1ad77eef80cd0460b66b7925a08a65f0d..8361e6e4e3d2d4829d3ce3c6f3ec4a2ac974e86e 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -72,7 +72,9 @@ with custom merge tool commands and has the same value as `$MERGED`.
 --symlinks::
 --no-symlinks::
        'git difftool''s default behavior is create symlinks to the
-       working tree when run in `--dir-diff` mode.
+       working tree when run in `--dir-diff` mode and the right-hand
+       side of the comparison yields the same content as the file in
+       the working tree.
 +
 Specifying `--no-symlinks` instructs 'git difftool' to create copies
 instead.  `--no-symlinks` is the default on Windows.