Merge branch 'jk/difftool-dir-diff-edit-fix'

diff --git a/git-difftool.perl b/git-difftool.perl
index c433e86f09e9c10e2bf94d7e5cc61364a33aab2b..663640d33cb99a98135b38b95947416b4a8d49b9 100755 (executable)
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -353,7 +353,7 @@ sub main
        }
        if ($opts{gui}) {
                my $guitool = Git::config('diff.guitool');
-               if (length($guitool) > 0) {
+               if (defined($guitool) && length($guitool) > 0) {
                        $ENV{GIT_DIFF_TOOL} = $guitool;
                }
        }