merge-tree: fix typo in "both changed identically"
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: ab5f42422d7e025c3151d91cc5ec0d20b9a80922)
-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