difftool: Disable --symlinks on cygwin
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>
This commit is contained in:
parent
ceb1497a74
commit
190f5475f2
@ -338,7 +338,8 @@ sub main
|
|||||||
gui => undef,
|
gui => undef,
|
||||||
help => undef,
|
help => undef,
|
||||||
prompt => undef,
|
prompt => undef,
|
||||||
symlinks => $^O ne 'MSWin32' && $^O ne 'msys',
|
symlinks => $^O ne 'cygwin' &&
|
||||||
|
$^O ne 'MSWin32' && $^O ne 'msys',
|
||||||
tool_help => undef,
|
tool_help => undef,
|
||||||
);
|
);
|
||||||
GetOptions('g|gui!' => \$opts{gui},
|
GetOptions('g|gui!' => \$opts{gui},
|
||||||
|
Loading…
Reference in New Issue
Block a user