Remove possibility to merge without commit

There is a default value, but there would always be a merge commit. Otherwise this is a non-sense: you cannot merge without a commit.
Close #12