merge-file: add option to select union merge favor
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 3a15048d833e2d6599091a9f7c14b0fa926c3bbf)
-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