Barrett Ruth 700a9a21ad fix(conflict)!: change default nav keymaps from ]x/[x to ]c/[c (#132) ... ## Problem The default conflict navigation keymaps `]x`/`[x` are non-standard. Vim natively uses `]c`/`[c` for diff navigation, so the same keys are far more intuitive for conflict jumping. ## Solution Change the defaults for `conflict.keymaps.next` and `conflict.keymaps.prev` to `]c` and `[c`. This is a breaking change for users relying on the previous defaults without explicit configuration.		2026-02-24 12:07:54 -05:00
..
diffs.nvim.txt	fix(conflict)!: change default nav keymaps from ]x/[x to ]c/[c (#132)	2026-02-24 12:07:54 -05:00