merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t4013 / diff.diff_--name-status_dir2_dir
1 $ git diff --name-status dir2 dir
2 $