t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit user-manual.txt: prefer 'merge --abort' over 'reset --hard' (fc991b4)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$