checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: f0531a2937e919e763ab05e9800aef51658104fc)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt