t / t4013 / diff.diff_--no-index_dir_dir3on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1$ git diff --no-index dir dir3
   2$