Merge branch 'kb/am-directory'
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: 8318eb795e4bda87d16871ac8ddd5afed033d551)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6083 git-difftool-helper
-rw-r--r-- 3178 git-difftool.txt