test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / ciabot /
drwxr-xr-x   parent (dest: contrib; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 544 README
-rwxr-xr-x 6810 ciabot.py
-rwxr-xr-x 5932 ciabot.sh