merge: teach -Xours/-Xtheirs to symbolic link merge
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: fd48b464747c275b3d014b3f14d60d9ac19d184a)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt