Skip to content

Instantly share code, notes, and snippets.

@ianbattersby

ianbattersby/gist:3258797

Created August 4, 2012 17:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ianbattersby/3258797 to your computer and use it in GitHub Desktop.
Save ianbattersby/3258797 to your computer and use it in GitHub Desktop.
Download ZIP
Git Araxis merge on *nix
Raw
gistfile1.txt
[merge]
tool = araxis
[mergetool "araxis"]
cmd = araxisgitmerge \"$REMOTE\" \"$BASE\" \"$PWD/LOCAL\" \"$PWD/MERGED\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment