commit test.txt
Merge branch 'master' of github.com:JRuiChen/learngit
a
delete origin readme
solve conflict
Merge branch 'test'
Merge branch 'test'
Merge branch 'test' of https://github.com/JRuiChen/learngit
add 2.txt
add 3
Merge branch 'test'
delete cj.txt
add cotent 1.txt