On Thu, Aug 16, 2012 at 6:00 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Phil Hord <phil.hord@xxxxxxxxx> writes: > >> So, the next roll will remove the tests for MERGE_RR and will be more >> explicit about the potential for mergetool confusion and/or the fact >> that it is not explicitly tested here. >> >> I'll wait a little longer for any further comments. > > Mild ping to a seemingly stalled topic. I was going to say the same thing. Patch v3 series is here: http://permalink.gmane.org/gmane.comp.version-control.git/201282 http://permalink.gmane.org/gmane.comp.version-control.git/201283 I assume these were missed because I sent them during some critical point in the release cycle. But maybe it was because I missed some step in the submission-revision protocol. If the latter, please let me know and I will try to learn to do better next time. Phil ~ resent due to missed ReplyAll button -- 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