Junio C Hamano <junkio@cox.net> wrote: > * Martin Langhoff proposed git-xxdiff as a helper after a failed > merge. > > Message-ID: <11546492331601-git-send-email-martin@catalyst.net.nz> > > I like the general idea of this a lot, but am having a bit of > trouble envisioning how we can integrate this while making > sure mergers other than xxdiff can be added easily without > disrupting the end user experience. In StGIT I can configure the merge command and I currently use the attached script (I need to add it to the StGIT repository). It tries diff3 first and, if that fails, invokes emacs' merge (can use xxdiff as well). It also checks whether the file was modified in case I want to exit and solve the conflict later (maybe after getting conflict information for the other files). -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This archive was generated by hypermail 2.1.8 : 2006-08-18 18:55:23 EST