merge overwrites unstaged changes in renamed file
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 30fd3a5425)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt