qt git merge tool安装

使用qtcreator合并代码时冲突时使用。

1、安装DiffMerge

通过网盘分享的文件：DiffMerge_4.2.0.697.stable_x64.msi
链接: https://pan.baidu.com/s/1PX6d4xlVZsJok1KrR_neAA?pwd=2zhs 提取码: 2zhs 
--来自百度网盘超级会员v5的分享

2、修改git配置文件

配置文件路径：C:\Users\你的用户名\.gitconfig

[user]
	name = xx
	email = xx
[credential "http://git远程ip:3000"]
	provider = generic
[core]
	autocrlf = true
[http]
	postBuffer = 524288000

[diff]
    tool = diffmerge

[difftool "diffmerge"]
    cmd = "C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe" \"$LOCAL\" \"$REMOTE\"

[merge]
	tool = diffmerge

[mergetool "diffmerge"]
	trustExitCode = true
	cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

3、环境变量