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

[git/debian.git] / t / t4013 / diff.diff-tree_--summary_initial_mode

$ git diff-tree --summary initial mode
 mode change 100644 => 100755 file0
$