t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: Fix multiple file rename across D/F conflict (ae74548)
   1$ git diff --no-index dir dir3
   2$