diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
commit | 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5 (patch) | |
tree | 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee /git-difftool.txt | |
parent | ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 (diff) | |
download | git-htmldocs-3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5.tar.gz |
Autogenerated HTML docs for v1.8.3-rc3
Diffstat (limited to 'git-difftool.txt')
-rw-r--r-- | git-difftool.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-difftool.txt b/git-difftool.txt index 8361e6e4e..11887e63a 100644 --- a/git-difftool.txt +++ b/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 |