Skip to content

Instantly share code, notes, and snippets.

@AliceWaddicor
Created August 8, 2014 17:05
Show Gist options
  • Save AliceWaddicor/f59b290af0b6b488e00e to your computer and use it in GitHub Desktop.
Save AliceWaddicor/f59b290af0b6b488e00e to your computer and use it in GitHub Desktop.
[mergetool]
prompt = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment