Merge branch 'sm/show-superproject-while-conflicted' into maint
[git] / t / t4013 / diff.diff_--name-status_dir2_dir
1 $ git diff --name-status dir2 dir
2 $