Skip to content

Instantly share code, notes, and snippets.

@fapestniegd

fapestniegd/gist:3961017

Created October 26, 2012 19:45
Show Gist options

  • Select an option

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

Select an option

Learn more about clone URLs
Save fapestniegd/3961017 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
master----------------------------------------------------------------------------------------
|
+ A--------X modified ------------------------merge to B--\
| \
+ B ---------------X modified differently----------------------- [ X modificaitons not present ]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment