merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir