merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt