cherry-pick/revert: add scissors line on merge conflict
[git] / t / t8005 /
drwxr-xr-x   ..
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt