and simple
& simple
conflict fixed
add merge
merge with no-ff
two
dev
Merge branch 'dev'
master master master
ok dev
ok two
ok merge
ok merge
001
002
qqqqqq
1
2
qqq
Merge branch '002'