smashwilson/merge-conflicts — pull request #7 by smashwilson (2014-03-14 19:53:37+00:00)
Title: Add keymap bindings for conflict resolution and navigation.

You should be able to resolve and skip through conflicts without touching the mouse, because, really. I'll show the bindings on the buttons, too, so there's some visual reinforcement.

This has the side benefit of adding more commands that you can use from the command palette or trigger from other plugins.