Skip to content

Instantly share code, notes, and snippets.

@Osse

Osse/gist:9555025

Created March 14, 2014 19:31
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Save Osse/9555025 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
...
...
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment