From: Junio C Hamano Date: Mon, 18 Jul 2011 23:39:27 GMT Subject: Re: [PATCH 26/48] merge-recursive: Allow make_room_for_path() to remove D/F entries Message-ID: <7vaacbcg5s.fsf@alter.siamese.dyndns.org> In-Reply-To: <1307518278-23814-27-git-send-email-newren@gmail.com> What 23/-26/48 tries to do feels quite sane. Thanks.