xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / t / t4109 /
drwxr-xr-x   parent (dest: t; base: e0af48e49682ea3345f932f6b9e7fa7c5e5e611a)
-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