t / t4013 / diff.diff_--name-status_dir2_diron commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1$ git diff --name-status dir2 dir
   2$