b edit a.txt add one line
Merge branch 'master' of https://github.com/shaoxianhui/temp

Conflicts:
	a.txt