Requested by @cambot in #890:
it would be nice if there were an "Abort Merge" button somewhere that would execute git merge --abort to completely back out of the attempted merge. If you knew you were in a merge conflict state, you could conditionally add an "Abort" button next to Stash/discard.
