merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / contrib / ciabot /
drwxr-xr-x   parent (dest: contrib; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 544 README
-rwxr-xr-x 6805 ciabot.py
-rwxr-xr-x 5932 ciabot.sh