在Ubuntu 12.04下配置diff merge 工具 SourceGear DiffMerge
首先官网下载http://www.sourcegear.com/diffmerge/，直接安装即可
然后在console里面执行：
git config --global diff.tool diffmergegit config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"'git config --global merge.tool diffmergegit 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
# diff the local file.m against the checked-in versiongit difftool file.m# diff the local file.m against the version in some-feature-branchgit difftool some-feature-branch file.m# diff the file.m from the Build-54 tag to the Build-55 taggit difftool Build-54..Build-55 file.m
git mergetool
