t / t4013 / diff.diff_--name-status_dir2_diron commit git-merge: add support for branch.<name>.mergeoptions (aec7b36)
   1$ git diff --name-status dir2 dir
   2A       dir/sub
   3$