merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: b541248467fa47979a34e3f1c5bbe3308fbdc4d1)
-rw-r--r-- 23 1-UTF-8.txt
-rw-r--r-- 100 2-UTF-8.txt
-rw-r--r-- 68 EUCJP.txt
-rw-r--r-- 86 ISO-2022-JP.txt
-rw-r--r-- 15 ISO-8859-1.txt