t / t4013 / diff.diff_--name-status_dir2_diron commit Which merge_file() function do you mean? (fa2364e)
   1$ git diff --name-status dir2 dir
   2$