t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1$ git diff --no-index dir dir3
   2$