t / t4013 / diff.diff_--no-index_dir_dir3on commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1$ git diff --no-index dir dir3
   2$