Skip to content

Instantly share code, notes, and snippets.

@pavelburov

pavelburov/.gitconfig

Last active April 30, 2019 10:36
Show Gist options
  • Save pavelburov/7ec52c0c4d79fc953c5a6f18f9780006 to your computer and use it in GitHub Desktop.
Save pavelburov/7ec52c0c4d79fc953c5a6f18f9780006 to your computer and use it in GitHub Desktop.
Download ZIP
Configuring AraxisMerge as mergetool for git
Raw
.gitconfig
[merge]
tool = araxis
[mergetool "araxis"]
cmd = Compare.exe -merge -wait -max -title1:'Local' -title2:$MERGED -title3:'Remote' $LOCAL $BASE $REMOTE $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment