merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
[git/git-svn.git] / contrib / ciabot / 
treee3cf1630a38ec03e3e6a65a5b5503663ffea851f
drwxr-xr-x   ..
-rw-r--r-- 544 README
-rwxr-xr-x 6805 ciabot.py
-rwxr-xr-x 5932 ciabot.sh