merge script: allow custom strategies
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: e69dccf8cd4576be804597b2960aa7d0020a65db)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt