EXAMPLE
Merge branch 'master' of https://github.com/wangxiaoming2/test

Conflicts:
	2.txt