Minimize and restore the MergeConflictsView.

Replace the "hide" button with fold and unfold spans. Minimize and restore the view when it's clicked.