test --no-ff
test --no-ff 2
merge with --no-ff