Merge branch 'kb/full-history-compute-treesame-carefully-2'

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 8361e6e4e3d2d4829d3ce3c6f3ec4a2ac974e86e..11887e63a05904d95f7d07d51b818721b33c0b66 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -69,8 +69,7 @@ with custom merge tool commands and has the same value as `$MERGED`.
 --tool-help::
        Print a list of diff tools that may be used with `--tool`.
 
---symlinks::
---no-symlinks::
+--[no-]symlinks::
        'git difftool''s default behavior is create symlinks to the
        working tree when run in `--dir-diff` mode and the right-hand
        side of the comparison yields the same content as the file in