Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx> writes: > On Jun 10, 2007, at 3:55 PM, Junio C Hamano wrote: > >> I do not see problems in the mergetool part, other than that I >> mildly suspect that opendiff -- actually FileMerge -- might want >> to be in the test -n "$DISPLAY" section, but that is inherited >> from the previous iteration so in that sense leaving outside is >> a sane thing to do. > > Actually, opendiff (as FileMerge.app) is available under OS X, where > $DISPLAY is not set. Heh, a graphical environment that does not use DISPLAY... Thanks. - 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
