Add new test to ensure git-merge handles pull.twohead and pull.octopus
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: b2eabcc2539c021ea6cb2d1d2d28c8213986a186)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 273636 gitk
drwxr-xr-x - po