Add new test to ensure git-merge handles pull.twohead and pull.octopus
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: b2eabcc2539c021ea6cb2d1d2d28c8213986a186)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 73001 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows