Merge branch 'jc/maint-1.6.0-pack-directory'
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: f474c526618d5d1111b585a6344e012fb731d3fe)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6126 git-difftool-helper
-rw-r--r-- 3188 git-difftool.txt