[core] autocrlf = false [merge] tool = p4merge [mergetool "p4merge"] path = C:/Program Files/Perforce/p4merge.exe [diff] tool = kdiff3 [difftool "kdiff3"] path = C:/Program Files/KDiff3/kdiff3.exe trustExitCode = false