Home NewsBlog Projects Contact
E.X.P.L.O.R. in development now! Cool Developer Stuff

Blaine's Git Configuration

[user]
name = USERNAME
email = email@email.com
[diff]
tool = p4merge
[difftool p4merge]
cmd = p4merge.exe $LOCAL $REMOTE
[merge]
tool = p4merge
[mergetool p4merge]
cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
trustExitCode = true
keepBackup = false