Subject: Re: [PATCH 36/37] merge-recursive: Make room for directories in D/F conflicts

From: Johannes Sixt <[email-masked]>
Date: Mon, 20 Sep 2010 13:40:45 +0200

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