Show the merge exception when aborting
Merge pull request #281 from lloydmeta/feature/show-merge-exception

Show the merge exception when aborting
Merge remote-tracking branch 'upstream/master' into master-pbaranchikov-hideExcludedChanges