fix(conflict): use git-conflict.nvim keymap convention #207

Merged

barrettruth merged 1 commit from fix/conflict-keymaps into main

2026-04-03 17:44:03 +00:00

barrettruth commented

2026-04-03 17:41:59 +00:00

Problem

Conflict resolution keymaps (doo/dot/dob/don) collide with fugitive's d-prefix diff namespace and have unclear mnemonics.

Solution

Adopt the git-conflict.nvim convention (co/ct/cb/c0) — shorter, well-known, and frees the d prefix entirely for diff maps.

Closes #204

## Problem Conflict resolution keymaps (`doo`/`dot`/`dob`/`don`) collide with fugitive's `d`-prefix diff namespace and have unclear mnemonics. ## Solution Adopt the git-conflict.nvim convention (`co`/`ct`/`cb`/`c0`) — shorter, well-known, and frees the `d` prefix entirely for diff maps. Closes #204