Show merge conflicts even when the user can't resolve them

Sometimes it's nice to see where the conflicts are, even if you can't resolve them in the UI. We could:

1. Add a new tab, next to the diffs tab, to show the conflicts.
2. Show the fancy interactive view for conflicts that can be resolved in the UI.
3. Show the filename for all other conflicts.

/cc @alfredo1