[PATCH] Use a temporary index file when we merge the common ancestors.
[git.git] / git-merge-octopus.sh
2005-09-11 Junio C HamanoMulti-backend merge driver.