Update test.txt
df
merge
modify gao.txt
update gao.txt
d
Merge branch 'master' of https://github.com/gaoduntao/test
sdfsdf