On Fri, Jun 13, 2008 at 11:17:51PM -0700, Junio C Hamano wrote: > The reason I suggested either a cheap runtime check or command line > override was because you can be accessing the same repository from two > different machines, with different kdiff3. If you check once and store > the result in .gitconfig or .git/config, it would not help the situation a > bit, would it? Good point. I'm not sure 0.5s is really fast enough to be considered a "cheap runtime check", unfortunately. At the very least it should be cached across a single "git mergetool" invocation, though; maybe if that were the case it would be acceptable. - Ted -- 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