Merge branch 'jk/add-p-skip-conflicts' into maint
[gitweb.git] / contrib / diffall /
drwxr-xr-x   parent (dest: contrib; base: 4579a0547cc558bd0e341adb77897e1f2f331f78)
-rw-r--r-- 1286 README
-rwxr-xr-x 5698 git-diffall