commit in dev branch
edit in master
Merge branch 'dev'
edit branch in master
edit branch again
Merge branch 'dev'

Conflicts:
	dev.h
merge test
edit in dev3
conflict fix
中文备注
Merge pull request #1 from caoyanwei/dev

Dev