add happy.txt
edit happy.txt
what a xxxx day
Merge branch 'exp' of https://github.com/leeweo/test into exp
modified in b111
modified in b222
modified in b000
Merge branches 'b000', 'b111' and 'b222'
in b000
in b111
in b222
Merge branches 'b000', 'b111' and 'b222'
again
new branch b000
Merge branch 'b000'
second xxxxx
Merge branch 'exp'
modified in branch exp
Merge branch 'exp'

Conflicts:
	abc.xx
delete abc.xx in branch exp
Merge branch 'exp'