Hi, On Thu, 7 May 2009, Dave O wrote: > Hi, I've encountered a particular merge that causes a segfault, and was > able to successfully bisect git to commit 36e3b5e. As you already found the commit, you could have Cc:ed me already. It is pure luck that I did not miss your bug report. > However, I'm unable to come up with a simple repro that doesn't involve > the source tree that I found it on, which unfortunately I'm not able to > share. Sigh. > I've debugged this a bit, and it seems to happen only when there's > sufficient file creations and deletions to surpass rename_limit in > diffcore_rename, and a rename/delete conflict is encountered. Maybe you can set merge.renameLimit really small, and then reproduce? 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