Skip to content

Instantly share code, notes, and snippets.

@anaisbetts

anaisbetts/gist:1325368

Created October 30, 2011 02:02
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save anaisbetts/1325368 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save anaisbetts/1325368 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment