Merge branch 'va/i18n-perl-scripts'

diff --git a/git-difftool.perl b/git-difftool.perl
index 8d3632e556690eb815af3a9fee277f5ea355572a..674828de3920634505291eee03f8ea908430d938 100755 (executable)
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -183,6 +183,10 @@ sub setup_dir_diff
                }
        }
 
+       # Go to the root of the worktree so that the left index files
+       # are properly setup -- the index is toplevel-relative.
+       chdir($workdir);
+
        # Setup temp directories
        my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
        my $ldir = "$tmpdir/left";