AraxisMerge和beyond Compare做git mergetool配置

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

Windows下面我们可以用beyond compare来做merge工具

[diff]
    external = 'C:/Program Files (x86)/Beyond Compare 4/BCompare.exe' "$PWD/$LOCAL" "$PWD/$REMOTE"
    renames = true

[mergetool "bcomp"]
    cmd = 'C:/Program Files (x86)/Beyond Compare 4/BCompare.exe' "$PWD/$REMOTE" "$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$MERGED"
    trustExitCode = false

[mergetool]
    keepBackup = false

[merge]
    tool = bcomp
    stat = true