branch test
branch test in master
branch test after merge
test --no-ff in dev
merge from dev with --no-ff
test without --no-ff in dev
Merge branch 'dev'