Git - configuration to use p4merge for diff
On Windows
1
2
3
4
5
6
7
8
9
10
[diff]
tool = p4merge
[difftool "p4merge"]
path = c:\\Program Files\\Perforce\\p4merge.exe
[merge]
tool = p4merge
[mergetool "p4merge"]
path = c:\\Program Files\\Perforce\\p4merge.exe
trustExitCode = true
keepBackup = false