merge-recursive: check for file level conflicts then get new name
[git/debian.git] / t / t4013 / diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir
blob41b7baf0a534b26bf0cb43c390ba8c2c750aaa19
1 $ git diff --no-index --raw --abbrev=4 dir2 dir
2 :000000 100644 0000 0000 A      dir/sub