On Fri, Nov 25, 2016 at 12:05:00PM +0100, Johannes Schindelin wrote: > > I would have expected it to just be a build-time flag, like: > > > > make BUILTIN_DIFFTOOL=Yes test > > That works for Git developers. > > I want to let as many users as possible test the builtin difftool. > Hopefully a lot more users than there are Git developers. > > Which means that I need a feature flag in production code, not a build > time flag. Ah, I didn't realize that was a requirement. If this is going to be part of a release and real end-users are going to see it, that does make me think the config option is the better path (than the presence of some file), as it's our standard way of tweaking run-time behavior. The implementation can still remain slightly gross if it's eventually going away. > > I'm happy with pretty much anything under the reasoning of "this does not > > matter much because it is going away soon". > > Yeah, well, I am more happy with anything along the lines of David's > review, pointing out flaws in the current revision of the builtin difftool > before it bites users ;-) Sorry, I can't really help much there, not having much knowledge of difftool. -Peff