Merge branch 'tr/maint-1.6.0-send-email-irt'
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: a57ca9dd400c8459a3cd3d769bab317f57d1e9ac)
-rwxr-xr-x 1472 git-difftool
-rwxr-xr-x 6487 git-difftool-helper
-rw-r--r-- 3237 git-difftool.txt