打开.gitconfig文件，加入如下代码即可
[diff] external = /Applications/AraxisMerge.app/Contents/Utilities/araxisgitdiff renames = true [mergetool "araxis"] cmd = ‘/Applications/AraxisMerge.app/Contents/Utilities/araxisgitmerge‘ "$PWD/$REMOTE" "$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$MERGED" trustExitCode = false [mergetool] keepBackup = false [merge] tool = araxis stat = true
执行git mergetool将会打开merge的文件对比窗口。
AraxisMerge做git mergetool配置 - [MAC]
原文：http://www.cnblogs.com/kangyi/p/4827078.html