branch test
AND simple
& simple
conflict fixed
增加分支合并
用非fast froward模式合并
2014-12-12 10:42:53 {by yq}
测试yq合并
Merge branch 'dev'
fix bug 101
stash merge
Merge branch 'yq'