smashwilson/merge-conflicts — pull request #14 by smashwilson (2014-03-16 01:25:53+00:00)
Title: Minimize and restore the MergeConflictsView.

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