xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: e0af48e49682ea3345f932f6b9e7fa7c5e5e611a)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch