modified 3
add new file 4.txt
 分支上的改动4.txt
主干的改
Merge branch 'git-test-test'
 modify branch
modify master
Merge branch 'git-test-test'

Conflicts:
	4.txt