merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t7500 /
drwxr-xr-x   ..
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off