merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t7006 /
drwxr-xr-x   ..
-rwxr-xr-x 1272 test-terminal.perl