merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 3c217c077a86)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt