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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html