On Tue, Feb 26, 2013 at 12:06:42PM -0800, Junio C Hamano wrote: > It seems that we have a corner case bug in two-way merge to reset > away the conflicts with "read-tree -u --reset HEAD ORIG_HEAD".
Isn't this a repeat of: http://thread.gmane.org/gmane.comp.version-control.git/202440/focus=212316 whose fix never got finalized? It's on my todo list, but it seems that items keep sinking further down on that list, rather than getting completed. :-/ -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
