代码提交信息
new file commited
I dont want these files
test a files
submit1
modified
branch
master add
Merge branch 'test_branch' hehe

Conflicts:
	a1.txt
aa
hehe
Merge branch 'test_branch'
hello
haha
diff resolved
Merge remote-tracking branch 'github/master'