commit test
ano
conflict fixed
1
change2
Merge branch 'branch1'
change3
mege with no-ff
bug merge
meger bug101branch
merge workbranch
meger branchname
Merge branch 'master' of https://github.com/zhaozhili/mf