Add new test to ensure git-merge handles pull.twohead and pull.octopus
[git/spearce.git] / gitk-git / 
tree615732133b5e3dcd80f5477f3ca94574e4430957
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 273636 gitk
drwxr-xr-x - po