From 190f5475f2a7edb777b65367d8796177aa13c830 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Tue, 24 Jul 2012 20:14:24 -0700 Subject: [PATCH] difftool: Disable --symlinks on cygwin Symlinks are not ubiquitous on Windows so make --no-symlinks the default. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-difftool.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-difftool.perl b/git-difftool.perl index 6f8bb73cd..17d4de661 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -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}, -- 2.26.2