Created
November 23, 2020 08:57
-
-
Save sorenjuul/3796a77321bc0a8ec26a2685991afacc to your computer and use it in GitHub Desktop.
.gitconfig mergetool setup for wsl (p4merge)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff.tool=p4merge | |
| merge.tool=p4merge | |
| difftool.p4merge.cmd=p4merge.exe "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" | |
| mergetool.p4merge.cmd=p4merge.exe "$(wslpath -aw $BASE)" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $MERGED)" | |
| mergetool.p4merge.trustexitcode=false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment