Update 3.txt
changes the values 3.txt
Merge branch 'master' of http://github.com/coder2013/gitDemo

Conflicts:
	3.txt
master modifine 4.txt
merge commit
中文乱码测试
测试提交
Update 4.txt
冲突测试
Merge branch 'master' of http://github.com/coder2013/gitDemo
Update 4.txt
这次一定要有冲突
测试
Update 4.txt
Update 4.txt
Update 4.txt
adfsfsdfDFewfsdf
error merge
modified 4.txt
modified 4.txt