Linus Torvalds b48d5a050a 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>

2007-08-10 13:59:19 -07:00

940 B

Raw Blame History

View Raw