Another tip for users invoking diff from gitk (by right-clicking the context menu item "External Diff"):
The above settings may get overridden by gitk's preferences. In that case, change the tools in gitk's menu Edit → Preferences → General → External diff setting.