smashwilson/merge-conflicts — pull request #66 by smashwilson (2014-06-21 15:58:04+00:00)
Title: Highlight the cursor line within conflict sides.

This fixes #28.

If your current style applies an `!important` style to `.cursor-line`, it'll override this. That's probably okay because you'll still get feedback on where you are, it just won't be *my* feedback.