在Ubuntu 12.04下配置diff merge 工具 SourceGear DiffMerge

最新推荐文章于 2022-05-13 13:49:14 发布

iteye_1908

最新推荐文章于 2022-05-13 13:49:14 发布

阅读量655

点赞数 1

文章标签： git

本文链接：https://blog.csdn.net/iteye_1908/article/details/82450408

版权

首先官网下载[url]http://www.sourcegear.com/diffmerge/[/url]，直接安装即可

然后在console里面执行：

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

执行成功后能使用git 来diff了


# diff the local file.m against the checked-in version
git difftool file.m

# diff the local file.m against the version in some-feature-branch
git difftool some-feature-branch file.m

# diff the file.m from the Build-54 tag to the Build-55 tag
git difftool Build-54..Build-55 file.m

Merge也ok：