How to set default diff/merge tool for all users?

[david_mikula]

Is it possible to set the default diff/merge tool for all users?

I am using the Enterprise MSI installer in an academic lab environment. Ideally, I'd like to set P4Merge as the default tool for all users. 

It appears that setting it in .gitconfig gets overridden by SourceTree. 

[Martin Runge]

Hi @david_mikula

This could happen if Sourcetree has a configuration for this; go to Tools > Options > Diff and set both External Diff Tool and Merge Tool to System Default. That makes Sourcetree fall back to the git difftool and mergetool values instead of writing its own, so your .gitconfig entries for P4Merge are respected again.

Cheers, Martin