hello a from b
revert change in b
clear files
Merge branch 'master' of https://github.com/AndyChen1985/TestGit

Conflicts:
	a.txt
	b.txt
test git diff
clear file second