Add ability to create merge commits after a merge
Add --abort switch to `scv merge`