g1
g2
Merge pull request #1 from zwhflytest/master

"git merge --no-ff"?zwhfly