Skip to content

Instantly share code, notes, and snippets.

@AliceWaddicor

AliceWaddicor/git merge section

Created August 8, 2014 17:03
Show Gist options
  • Save AliceWaddicor/7b769181dd16ebedc0f9 to your computer and use it in GitHub Desktop.
Save AliceWaddicor/7b769181dd16ebedc0f9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git merge section
[merge]
tool = semanticmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment