smashwilson/merge-conflicts — pull request #87 by smashwilson (2014-11-08 19:40:04+00:00)
Title: [wip] Changes going nuts

As demonstrated in #79, SideView.reposition() wasn't taking the current scroll position into account, which was doing bizarre things to SideView placement whenever a reposition() was triggered.

- [x] Handle the current scrolling offset when repositioning SideViews.
- [ ] Stale decoration classes are being left on lines corresponding to a resolved conflict.