On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote: > The original idea was to use an environment variable > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets those variables, and > we do want to use that feature flag to run the tests with, and without, > the feature flag. > > Besides, the plan is to add an opt-in flag in Git for Windows' > installer. If we implemented the feature flag as an environment > variable, we would have to modify the user's environment, in order to > make the builtin difftool the default when called from Git Bash, Git CMD > or third-party tools. Hi Johannes, Why is this not a normal configuration variable (as in git config difftool.builtin true or something)? It doesn't make much sense to me to introduce a way of configuring git by introducing magic files, when a normal configuration variable would do just fine, and the GfW installer can also set such variables, like it does for the crlf config I believe. -- Dennis Kaarsemaker http://www.kaarsemaker.net