t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$