smashwilson/merge-conflicts — pull request #35 by smashwilson (2014-03-22 22:24:29+00:00)
Title: Autoscroll to the first conflict.

Fixes #22.