b func
Merge branch 'b'
init
x changes
Merge branch 'x' into dev
base
x changes
dev readme
x changes
Merge branch 'x' into dev
Merge branch 'dev'
blah
b stuff
b stuff
Merge branch 'b' into dev
a stuff
Merge branch 'a' into dev
k stuff\!
triple j
Merge branch 'k' into dev