Refactor some ConflictMarker specs.
Fetch the "active" conflict(s) on request.
merge-conflicts:resolve-current

When emitted, this event resolves all active conflicts in favor of the side that
you have a cursor in. It skips conflicts if you have cursors in *both* sides.
Use editor commands to accept merge results.
Jump to the next or previous conflict markers.
Make sure the resolution commands are no-ops.

If you don't have any active conflicts, nothing happens.
Handle next and previous jumping without active.
Map cmd-alt keys to conflict resolution commands.
Decorate buttons with matching keystrokes.
s/resolve-current/accept-current/ for consistency.
Add a command for reverting, too.
Record a new gif.

Let's show in-place edits and the command keys.
Mark it off in the README.
Merge pull request #7 from smashwilson/keymap

Add keymap bindings for conflict resolution and navigation.