Hi, On Mon, 9 Jul 2007, Uwe Kleine-K?nig wrote: > Junio C Hamano wrote: > > > Not even compile tested, but something like this should do. > It compiles, but seems not to work. I will try to make up a test. I compiled it, and it works as expected. For safety, git-rerere leaves the index unmerged, so that you can verify that you wanted this resolution. Will resubmit with a test case. 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