builtin/merge.c: fix a bug with trivial merges
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 40d71940b6a0dadb7873cce614992f1d71fcdfbd)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt