Brett Allred

be a student, not a follower

.gitconfig – Configuration Settings W/ P4Merge & P4Diff

1
2
3
4
5
6
7
8
9
10
11
12
13
14
[merge]
keepBackup = false;
tool = p4merge

[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
external = p4diff

[difftool "p4diff"]
external = '"C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"'