Merge branch 'da/mergetool-delete-delete-conflict'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: e094194f08c3d7f3d9ea1714d34ee20ba82f6851)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight