new commit second new line
Merge remote-tracking branch 'origin/featureA' into featureA

Conflicts:
	lib/simplegit.rb