Skip to content

Instantly share code, notes, and snippets.

@philosopherdog

philosopherdog/gitconfig

Created April 4, 2015 02:26
Show Gist options
  • Save philosopherdog/6c63da23261bf873c337 to your computer and use it in GitHub Desktop.
Save philosopherdog/6c63da23261bf873c337 to your computer and use it in GitHub Desktop.
Download ZIP
araxis merge gitconfig os x
Raw
gitconfig
[difftool]
prompt = false
[diff]
tool = araxis
[merge]
tool = araxis
[mergetool "araxis"]
path = /Applications/Araxis Merge.app/Contents/Utilities/compare
prompt = false
keepTemporaries = false
trustExitCode = false
keepBackup = false
[difftool "araxis"]
path = /Applications/Araxis Merge.app/Contents/Utilities/compare
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment