git-add: no need for -f when resolving a conflict in already tracked path
[gitweb.git] / t / t4109 /
drwxr-xr-x   parent (dest: t; base: 6e4f981ffb88c8a9d3d6128314f4dd4f54ffb8a8)
-rw-r--r-- 333 expect-1
-rw-r--r-- 246 expect-2
-rw-r--r-- 270 expect-3
-rw-r--r-- 363 patch1.patch
-rw-r--r-- 367 patch2.patch
-rw-r--r-- 393 patch3.patch
-rw-r--r-- 456 patch4.patch