merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / compat / vcbuild /
drwxr-xr-x   ..
-rw-r--r-- 1906 README
drwxr-xr-x - include
drwxr-xr-x - scripts