add file a.txr
u a.txt
u a.txt
add b.txt
del a,b.txt
add c.txt
d c.txt
add flod test
Merge branch 'master' of github.com:wjcgithub/yii_test