merge-recursive: check for file level conflicts then get new name

[git/debian.git] / t / t4013 / diff.diff-tree_--patch-with-raw_initial

$ git diff-tree --patch-with-raw initial
$