new fileA.txt
Merge git://github.com/yanguo4/try_git
l to r
first testing branch
2nd in testing
hot fix in master
hotfix version
Merge branch 'testing'

Conflicts:
	fileA.txt