t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: Nuke rename/directory conflict detection (605c1bc)
   1$ git diff --no-index dir dir3
   2$