kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
John Keeping 2013-03-14 20:19:39 +00:00 committed by Junio C Hamano
parent 55f56fee07
commit 8aa10d4a5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-difftool.txt
View File

@ -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 '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.
+ +
Specifying `--no-symlinks` instructs 'git difftool' to create Specifying `--no-symlinks` instructs 'git difftool' to create copies
copies instead. `--no-symlinks` is the default on Windows. instead. `--no-symlinks` is the default on Windows.


-x <command>:: -x <command>::
--extcmd=<command>:: --extcmd=<command>::