gistfile1.txt

brahma:shindig nathanloyer$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   content/sampledata/canonicaldb.json
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	deleted by us:      lib/entities/SFGuardUser.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	lib/entities/Profile.php