branch test
clone gitskills
ADD simple
& simple
conflict fixed
test conflict
continiu conflict
merge success
add merge for no-ff
merge with no-ff by master
vi too
Merge branch 'dev'
test no-ff
add kanwo
add kanwo & test no-ff
add feihuaxx
Merge branch 'ddd'
fix bug-101
dev fix bug