From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jul 2011 23:39:57 GMT
Subject: Re: [PATCH 29/48] merge-recursive: When we detect we can skip an update, actually skip it
Message-ID: <7voc0rb1ki.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1307518278-23814-30-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> ...  The reason this change works is due to the changes of the
> last few patches to (a) record_df_conflict_files instead of just unlinking
> them early, (b) allowing make_room_for_path() to remove D/F entries, and
> (c) the splitting of update_stages_and_entry() to have its functionality
> called at different points.

Nice.