Use p4merge or DiffMerge with git mergetool on OS Xhttp://blog.logicalrand.com/2008/9/9/use-p4merge-or-diffmerge-with-git-mergetool-on-os-x by cte • 18 years ago 1 0 18 years agoBLblog.logicalrand.com