Andrew's git / gitweb.git / t/t4013/diff.diff_--name-status_dir2_dir
?
t / t4013 / diff.diff_--name-status_dir2_diron commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1$ git diff --name-status dir2 dir
   2$