如上图所示，我想用mergetool来合并两个分支，但是却提示没有文件需要合并。但，直接用merge的话是需要合并的。
我的.gitconfig文件如下
[user]
email = [email protected]
name = XXXXXXXX
[http]
postBuffer = 524288000
[core]
autocrlf = false
[color]
ui = true
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
[merge]
tool = diffmerge
[diff]
tool = diffmerge
[mergetool]
keepBackup = false
[mergetool "diffmerge"]
cmd = git-mergetool-diffmerge-wrapper.sh "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
[difftool "diffmerge"]
cmd = git-difftool-diffmerge-wrapper.sh "$LOCAL" "$REMOTE"
使用 DiffMerge 的安装及配置步骤如下 Git Windows 下配置 Merge 工具 DiffMerge
Select Language