Merge branch 'mg/maint-submodule-normalize-path' into maint
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: 8af95ca0174f05344e36d05b61844c8af4764b92)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6126 git-difftool-helper
-rw-r--r-- 3188 git-difftool.txt