t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1$ git diff --no-index dir dir3
   2$