Show the merge exception when aborting

Makes it easier to figure out why the merge operation failed. Sometimes, the error has nothing to do with the merge itself (such as forgetting to set the git global username and email).