diff options
| author | David Aguilar <davvid@gmail.com> | 2012-07-24 20:14:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-26 13:07:15 -0700 |
| commit | 190f5475f2a7edb777b65367d8796177aa13c830 (patch) | |
| tree | 3e0acfa9d35305396c2647a523f36928bfec412d /git-difftool.perl | |
| parent | difftool: Handle compare() returning -1 (diff) | |
| download | git-190f5475f2a7edb777b65367d8796177aa13c830.tar.gz git-190f5475f2a7edb777b65367d8796177aa13c830.zip | |
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>
Diffstat (limited to 'git-difftool.perl')
| -rwxr-xr-x | git-difftool.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index 6f8bb73cd6..17d4de6618 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}, |