Make cherry-pick use rerere for conflict resolution.
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2)
-rwxr-xr-x 4172 test.pl