smashwilson/merge-conflicts — pull request #70 by smashwilson (2014-07-25 20:13:11+00:00)
Title: Use the new Decoration API.

It'll be *much* more efficient for me to use the decorations API to apply classes to conflict lines than it has been to remove and re-add them on every display update.

I'll probably take a stab at streamlining dirty detection (#68) while I'm at it.

Fixes #69.