ff commit
no-ff
no-ff!!!
no-ff!!!
add 'e'
Merge branch 'feature/merge-test4' into develop
add sub directory hogehoge