git difftool for mac

最新推荐文章于 2024-05-12 13:10:38 发布

jinhuazhe2013

最新推荐文章于 2024-05-12 13:10:38 发布

阅读量822

点赞数

分类专栏： git 文章标签： git

git 专栏收录该内容

8 篇文章 0 订阅

订阅专栏

DiffMerge轻量级代码比较框架
https://sourcegear.com/diffmerge/downloads.php

参考

http://quding0308.iteye.com/blog/1969831

注意问题：
1、下载时要下载：Download the DiffMerge OS X installer
2、在command中执行命令：

git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"'
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'
git config --global mergetool.diffmerge.trustExitCode true

or
修改~/.gitconfig文件，如下所示(请按需配置)：

[diff]     
    tool = diffmerge  
[difftool "diffmerge"]     
    cmd = /usr/bin/diffmerge \"$LOCAL\" \"$REMOTE\"     
[difftool]     
    prompt = false 
merge]  
    tool = diffmerge     
[mergetool "diffmerge"]     
    cmd = /usr/bin/diffmerge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"     
    trustExitCode = true