t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$