xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: e0af48e49682ea3345f932f6b9e7fa7c5e5e611a)
-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