On Mon, May 25, 2009 at 10:54:43AM +0200, Johannes Schindelin wrote: > 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. I have the same reservations. When I first picked up mergetool it supported ecmerge. ecmerge is also closed which is why I reasoned that it was ok to try and win over Windows users. It should be possible to configure it today using /etc/gitconfig, so we might be best served going down the add-an-entry-to-the-git-wiki route next time; provided Windows paths and shell-quoting doesn't drive us mad when writing it, of course ;) -- David -- 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