Skip to content

Instantly share code, notes, and snippets.

@pavelburov

pavelburov/.gitconfig

Last active April 30, 2019 10:07
Show Gist options
  • Save pavelburov/098fb8c502893f8adebbd9f137268e42 to your computer and use it in GitHub Desktop.
Save pavelburov/098fb8c502893f8adebbd9f137268e42 to your computer and use it in GitHub Desktop.
Download ZIP
Configuring WinMerge as mergetool for git
Raw
.gitconfig
[merge]
tool = winMerge
[mergetool "winMerge"]
cmd = WinMergeU.exe -e -u -wl -wr -dl "Local" -dm "Base" -dr "Remote" $LOCAL $BASE $REMOTE -o $MERGED -am
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment