Add --squash option to `scv merge`
`scv commit --amend` now works with merge commits as well