Skip to content

Instantly share code, notes, and snippets.

@marr

marr/gist:712951

Created November 24, 2010 01:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save marr/712951 to your computer and use it in GitHub Desktop.
Save marr/712951 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Merge conflict during commit: File or directory '.' is out of date; try updating: resource out of date; try updating at /usr/local/Cellar/git/1.7.2.1/libexec/git-core/git-svn line 572
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment