merge-recursive: Create function for merging with branchname:file markers
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: dac4741554e7)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt