t / t4013 / diff.diff_--name-status_dir2_diron commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1$ git diff --name-status dir2 dir
   2$