Skip to content

Commit

Permalink
difftool: Disable --symlinks on cygwin
Browse files Browse the repository at this point in the history
Symlinks are not ubiquitous on Windows so make --no-symlinks the default.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Jul 26, 2012
1 parent ceb1497 commit 190f547
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-difftool.perl
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ sub main
gui => undef,
help => undef,
prompt => undef,
symlinks => $^O ne 'MSWin32' && $^O ne 'msys',
symlinks => $^O ne 'cygwin' &&
$^O ne 'MSWin32' && $^O ne 'msys',
tool_help => undef,
);
GetOptions('g|gui!' => \$opts{gui},
Expand Down

0 comments on commit 190f547

Please sign in to comment.