git-merge: add support for --commit and --no-squash
[git] / contrib / continuous /
drwxr-xr-x   ..
-rw-r--r-- 12334 cidaemon
-rw-r--r-- 2171 post-receive-cinotify