Merge branch 'rs/color-grep'
[gitweb.git] / contrib / difftool /
drwxr-xr-x   parent (dest: contrib; base: b332368de87fba4fd9e6f8c163240f14ca00a9ea)
-rwxr-xr-x 1472 git-difftool
-rwxr-xr-x 6487 git-difftool-helper
-rw-r--r-- 3237 git-difftool.txt