[PATCH] Use git-octopus when pulling more than one heads.
[gitweb.git] / tools /
drwxr-xr-x   parent (dest: ; base: 521003ff52d1cf742350e1342bc2dd4ab1b51e6b)
-rw-r--r-- 450 Makefile
-rwxr-xr-x 2563 git-applymbox
-rwxr-xr-x 2675 git-applypatch
-rw-r--r-- 5049 mailinfo.c
-rw-r--r-- 2537 mailsplit.c