在另一个分支修改
tijiao
ti jiao e.txt
xian zai di er ci ti jiao
Signed-off-by: lisi <lisi@sina.com>
Merge branch 'test1' of http://github.com/makut1/cangku into test