Merge branch 'releases-1.0' into develop
Merge branch 'releases-1.1' into develop
Merge branch 'hotfix-1.1.1' into develop
add a new.md diff to master
new merge.js
Merge branch 'develop'
first commit
secend commit
cherry picking
i don not
secend commit

Conflicts:
	merge.js
what
...
mb
Merge branch 'develop'
merge.js

Conflicts:
	merge.js