merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t4013 / diff.diff-tree_-p_master
1 $ git diff-tree -p master
2 $