First Commit
test01: set 1 as content
Create b.txt with content 'master' in the master branch
b.txt bug fixed
a.txt bug fixed by idfer
Merge branch 'hotfixes'

Conflicts:
	b.txt
Update b.txt to master
Add cherry.txt

(cherry picked from commit 39a573b49376ca49dcec02252054501adc7ebe84)
Add a.txt
Update b.txt to rebase
Add rebase.txt
Update test01 to 'test01'
Merge branch 'rebase'
Add c.txt
Update c.txt to cc
Merge branch 'master' of https://github.com/idfer/sandbox