git-add: no need for -f when resolving a conflict in already tracked path
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 6e4f981ffb88c8a9d3d6128314f4dd4f54ffb8a8)
-rw-r--r-- 68 cp1251.txt
-rw-r--r-- 100 sjis.txt
-rw-r--r-- 100 utf8.txt