Use p4merge or DiffMerge with git mergetool on OS X · HackerTrans