delete ppp in hoge by bob
add piropiro in neco by master
Merge branch 'bob'
delete rows in hoge
delete foo in foo.txt by john
add aiaiaia in foo.txt by master
Merge branch 'john'
forward commit
modify pirppiko in neco by tom
modify piropira in neco by master
merge over the conflict
hyahhaaa
add 111 before aiaia in foo.txt by peter
add 333 after aiaia in foo.txt by master
done merge done done!!!
kokokookok