Make cherry-pick use rerere for conflict resolution.
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2)
-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