t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff (c192f9c)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$