AraxisMerge做git mergetool配置 - [MAC]

时间：2015-09-21 20:56:15 收藏：0 阅读：1020

打开.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的文件对比窗口。