Configure DiffMerge on MacOSX

2011-03-23 07:13:00 git diff mac

Based on this article, I modified it a little bit in order to make it work on Mac:

[diff]   tool=diffmerge                                                                                                                   
[difftool "diffmerge"]                                                                                                                      
  cmd = exec /Applications/DiffMerge.app/Contents/MacOS/DiffMerge \"$LOCAL\" \"$REMOTE\"                                                                                                                                   
[merge]                                                                                                                                     
  tool = diffmerge                                                                                                                    
[mergetool "diffmerge"]                                                                                                                            
  cmd = exec /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\"\n\"$LOCAL\" \"$BASE\" \"$REMOTE\"                                                                                           
  trustexitcode = false