Skip to content

Commit 190f547

Browse files
davvidgitster
authored andcommitted
difftool: Disable --symlinks on cygwin
Symlinks are not ubiquitous on Windows so make --no-symlinks the default. Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ceb1497 commit 190f547

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-difftool.perl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ sub main
338338
gui => undef,
339339
help => undef,
340340
prompt => undef,
341-
symlinks => $^O ne 'MSWin32' && $^O ne 'msys',
341+
symlinks => $^O ne 'cygwin' &&
342+
$^O ne 'MSWin32' && $^O ne 'msys',
342343
tool_help => undef,
343344
);
344345
GetOptions('g|gui!' => \$opts{gui},

0 commit comments

Comments
 (0)