merge: let custom strategies intervene in trivial merges
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49)
-rw-r--r-- 23 1-UTF-8.txt
-rw-r--r-- 100 2-UTF-8.txt
-rw-r--r-- 86 ISO-2022-JP.txt
-rw-r--r-- 15 ISO8859-1.txt
-rw-r--r-- 68 eucJP.txt