merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / contrib / continuous /
drwxr-xr-x   ..
-rw-r--r-- 12334 cidaemon
-rw-r--r-- 2171 post-receive-cinotify