0

I'm using meld as mergetool for git and I'm wondering why meld always shows three files when I run git mergetool. I would prefer to see only two files in meld (the HEAD version and the version from the other branch that I want to merge). Is it possible to configure meld so that it does the merge with only two files?

This is my current .gitconfig file:

[merge]
    tool = meld
[mergetool]
    prompt = false
[mergetool "meld"]
    trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
4

1 回答 1

1

您当前.gitconfig在三向目录中运行 Meld，比较$LOCAL、$BASE和$REMOTE. 如果您想将其设置为双向比较（假设您不想比较$REMOTE），只需将您的配置更改为（即删除$REMOTE命令参数）

cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" --output=\"$PWD/$MERGED\"
于 2017-01-07T19:05:13.907 回答