Hi, On Fri, 29 Jun 2007, Junio C Hamano wrote: > Hmph. > > * Are you sure about (1-pos)? > > * I _think_ we would want to favor our stage (i.e. #2) Hmph back. I _thought_ that our stage is #1, not even bothering to check the documentation. But it seems that you are right. So your code looks fine to me, except that I would move the whole get_index_entry_for_file_even_if_the_entry_is_unmerged(name, namelen) code into its own function. Want me to prepare a patch? If so, I'll do it tonight, since I will be occupied the rest of the (working) day. Ciao, Dscho - 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
