sgur
5/24/2011 - 4:58 AM

gitconfig (p4merge)

gitconfig (p4merge)

[merge]
	tool = p4merge
[diff]
	tool = p4merge
[difftool "p4merge"]
	path = c:/Program Files/Perforce/p4merge.exe
	cmd = \"c:/Program Files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "p4merge"]
	path = c:/Program Files/Perforce/p4merge.exe
	cmd = \"c:/Program Files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"