Merge branch 'jk/difftool-dir-diff-edit-fix'
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5483 test.pl