Skip to content

Instantly share code, notes, and snippets.

@benhamill
Created March 31, 2011 20:45
Show Gist options
  • Save benhamill/897217 to your computer and use it in GitHub Desktop.
Save benhamill/897217 to your computer and use it in GitHub Desktop.
[merge]
tool = kdiff3
[diff]
tool = kdiff3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment