merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t4013 / diff.diff_--no-index_--name-status_dir2_dir
1 $ git diff --no-index --name-status dir2 dir
2 A       dir/sub
3 $