- added command --no-ff to git merge
- added test for git merge --no-ff