Hi, On Mon, 25 May 2009, Junio C Hamano wrote: > * da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit > + mergetool--lib: add support for araxis merge > > I admit that I feel certain distaste in supporting a closed tool, but we > already make things bearable for people on Windows; Araxis is no worse, > right? Well, I think it is the first closed-source tool that we support, and I would feel less unhappy if somebody reported back that she tested it and it works fine. For the future, it might be better if mergetool could be configured using /etc/gitconfig to call the merge helper properly. Then we would not need to clutter git.git with properietary stuff, but could just have the Windows-specific handling in Git for Windows. 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