ability to undo a merge with reset

[crilleengvall]

Add a flag to pushed-merge command that uses reset --hard.
This is marked as the answer in this thread:
http://stackoverflow.com/questions/11722533/rollback-a-git-merge