merge-recursive: separate message for common ancestors
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: e0453cd8f09aa03f3752d994011963ced7dea3ee)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt