Add new test to ensure git-merge handles pull.twohead and pull.octopus
[gitweb.git] / t / t9121 /
drwxr-xr-x   parent (dest: t; base: b2eabcc2539c021ea6cb2d1d2d28c8213986a186)
-rw-r--r-- 1046 renamed-dir.dump