[PATCH] Use git-octopus when pulling more than one heads.
[git.git] / git-octopus-script
2005-08-24 Junio C Hamano[PATCH] Infamous 'octopus merge'