[PATCH] Use a temporary index file when we merge the common ancestors.