summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-03-14 20:19:39 +0000
committerJunio C Hamano <gitster@pobox.com>2013-03-14 14:29:02 -0700
commit8aa10d4a5bb2eceb78b689f0c13b334725a1019f (patch)
tree629200d05c948ed2f9ab5505cda54c1994c69d1a /Documentation/git-difftool.txt
parent55f56fee0765820d5c841e47b22f33f5a7253e16 (diff)
downloadgit-8aa10d4a5bb2eceb78b689f0c13b334725a1019f.tar.gz
git-difftool(1): fix formatting of --symlink description
Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e0e12e9470..e575fea1ad 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -74,8 +74,8 @@ with custom merge tool commands and has the same value as `$MERGED`.
'git difftool''s default behavior is create symlinks to the
working tree when run in `--dir-diff` mode.
+
- Specifying `--no-symlinks` instructs 'git difftool' to create
- copies instead. `--no-symlinks` is the default on Windows.
+Specifying `--no-symlinks` instructs 'git difftool' to create copies
+instead. `--no-symlinks` is the default on Windows.
-x <command>::
--extcmd=<command>::