Skip to content

Instantly share code, notes, and snippets.

@latentflip

latentflip/gist:435934

Created June 12, 2010 17:59
Show Gist options
  • Save latentflip/435934 to your computer and use it in GitHub Desktop.
Save latentflip/435934 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.diff
<<<<<<< HEAD
#Anything in here is what
#was in the branch you merged into
=======
#Anything in here is what
#was in the branch you merged from
>>>>>>> a-n-other-branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment