t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit Provide 'git merge --abort' as a synonym to 'git reset --merge' (35d2fff)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$