merge: let custom strategies intervene in trivial merges
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49)
-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