Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: b5a18787bd5c757b49a7ea4fdd73e62a1fee35de)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6126 git-difftool-helper
-rw-r--r-- 3188 git-difftool.txt