From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Aug 2007 19:15:54 +0000 (-0700)
Subject: Move old index entry removal from "unpack_trees()" into the individual functions
X-Git-Tag: v1.5.3-rc5~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b48d5a050afa30402c8281c223df9d7e58b4493c?hp=b48d5a050afa30402c8281c223df9d7e58b4493c

Move old index entry removal from "unpack_trees()" into the individual functions

This makes no changes to current code, but it allows the individual merge
functions to decide what to do about the old entry.  They might decide to
update it in place, rather than force them to always delete and re-add it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---