c add
d.txt add
Merge branch 'master' of https://github.com/shipengyan/git-test