From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 20 Sep 2010 11:40:45 GMT
Subject: Re: [PATCH 36/37] merge-recursive: Make room for directories in D/F conflicts
Message-ID: <4C97483D.8030605@viscovery.net>
In-Reply-To: <1284971350-30590-37-git-send-email-newren@gmail.com>

Am 9/20/2010 10:29, schrieb Elijah Newren:
> +	 * NOTE: This function relies on the fact that entries for a
> +	 * D/F conflict will appear adjacent in the index, with the
> +	 * entries for the file appearing before entries for paths
> +	 * below the corresponding directory.

I don't think that this is a generally valid assumption. There can be
other entries in between:

   this
   this.txt
   this/file

(where your focus is on "this").

-- Hannes