tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 6a843348ab08e7c701ac2343ffbe2d11ecb7ebab)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt