A post-modern development environment.

docs: add conflict navigation and resolution keybindings to keymap.md master

- ]= / [= in the unimpaired section (after ]G/[G) - Space x submap in a new 'Conflict' subsection under Space mode


Author Gaëtan Lehmann Committer Isaac Corbrey Date Commit cf82befa Parent 4a3f872e Change ID qwyrqnqo
+15
1 changed file