add --no-ff test
merge with no-ff
Git is free software
merged bug fix 101