Merge branch 'ff/submodule-no-fetch'
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: 7b83a9243147a8cec4f556af1d29f2cc21c12518)
-rwxr-xr-x 1475 git-difftool
-rwxr-xr-x 6126 git-difftool-helper
-rw-r--r-- 3188 git-difftool.txt