mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / contrib / continuous /
drwxr-xr-x   parent (dest: contrib; base: b0169d84df4c09ed7dfcc6aea5aecd177ddda75b)
-rw-r--r-- 12334 cidaemon
-rw-r--r-- 2171 post-receive-cinotify