merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / compat / vcbuild / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1440 clink.pl
-rw-r--r-- 810 lib.pl