GIT - Mac OS X: P4Merge for Mac

Command Listing

P4Merge en MAC es una excelente opción com herramienta de comparación de archivos gratis.

git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global merge.tool p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global diff.tool p4merge
git config --global difftool.prompt false
git config --global mergetool.prompt false

~/.gitconfig File (snip)

[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
[mergetool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
[difftool]
prompt = false
[mergetool]
prompt = false