merge_test
aaa
bbb
Merge branch 'test'

Conflicts:
	aaa.txt

	删除：      aaa.txt
	新文件：    a.txt
	新文件：    ttt.txt
Merge branch 'master' of github.com:mawennan/newtest

Conflicts:
	ttt.txt