t / t4013 / diff.diff_--name-status_dir2_diron commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
   1$ git diff --name-status dir2 dir
   2A       dir/sub
   3$