添加了一些中文
修改为UTF-8(No BOM)
new
Merge branch 'master' into TrunkEric
test
创建index.php, 此时已删除了test.txt
Merge commit '4c415066f29f70a7beb820bc06afe8238722409a' into TrunkEric