ini Git for Windows：将Helix Visual Merge Tool（P4Merge）设置为默认的mergetool

Posted 2021-05-24

Open `git-bash` and type

```bash
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
git config --global mergetool.p4merge.trustExitCode false
git config --global mergetool.keepBackup false
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd "p4merge \"$LOCAL\" \"$REMOTE\""
```

The `.gitconfig` should look like this

[merge]
    keepBackup = false
    tool = p4merge
[mergetool]
    prompt = false
[mergetool "p4merge"]
    cmd = p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[diff]
    tool = p4merge
[difftool]
    prompt = false
[difftool "p4merge"]
    cmd = p4merge \"$LOCAL\" \"$REMOTE\"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false