Git hook errors are not shown in UI

Zendesk issue: https://gitlab.zendesk.com/agent/tickets/15868

Moving from https://gitlab.com/gitlab-org/gitlab-ce/issues/1935

Merge errors resulting from git hooks are not shown to the user in the UI. It simply says "Something went wrong during merge". The log is the only way to identify what went wrong.

This is very confusing for users and even resulted in an emergency page for us. It took us a while to figure out what was actually happening.

How hard is it to expose this error to the UI?

cc/ @DouweM @dzaporozhets @JobV