Center conflict markers when you jump.

Fixes #23. I'm scrolling to the first line of the "ours" marker, because that seems like a reasonable place to be; I like having some context above the merge.