- added command --no-ff to git merge
- added test for git merge --no-ff
- changed readme to add the --no-ff value in git merge
- fixed merge no-ff test
- removed conditions to match behavior of Git
- Fixed indentation due to Javascript beautifier
Merge pull request #48 from codep0et/master

Added option --no-ff for git merge