[difftool "kdiff3"] path = kdiff3.sh trustExitCode = false [difftool] prompt = false [diff] tool = kdiff3 [mergetool "kdiff3"] path = kdiff3 trustExitCode = false keepBackup = false [merge] tool = vimdiff [core] autocrlf = false