Skip to content

Instantly share code, notes, and snippets.

@sorenjuul

sorenjuul/.gitconfig

Created November 23, 2020 08:57
Show Gist options
  • Save sorenjuul/3796a77321bc0a8ec26a2685991afacc to your computer and use it in GitHub Desktop.
Save sorenjuul/3796a77321bc0a8ec26a2685991afacc to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig mergetool setup for wsl (p4merge)
Raw
.gitconfig
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