Merging branch: temp-hotfix with no-ff
Merge branch 'develop'
Commit from SmartGit windows!
commit from osx -- should conflict with smartgit local repo
local commit that should conflict with origin
Merge remote-tracking branch 'origin/master'

Conflicts Resolved:
	TestProj2_DVCS/GLYFirstViewController.m
another another osx change -- should auto merge
random osx change to test remote status updates on smartgit
added files
side commit
Merge commit 'ca87362' into early-branch
sideside commit #2
Merge branch 'early-branch' into working
Merge branch 'working'
class-name change
hello from master-B\!
external rename
Merge branch 'working'