From 700a9a21adc1654972f6ff1cc4bf665453fe888c Mon Sep 17 00:00:00 2001
From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com>
Date: Tue, 24 Feb 2026 12:07:54 -0500
Subject: [PATCH] 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.
---
 doc/diffs.nvim.txt     | 20 ++++++++++----------
 lua/diffs/init.lua     |  4 ++--
 spec/conflict_spec.lua |  4 ++--
 spec/merge_spec.lua    |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/diffs.nvim.txt b/doc/diffs.nvim.txt
index dd87d46..65345d4 100644
--- a/doc/diffs.nvim.txt
+++ b/doc/diffs.nvim.txt
@@ -95,8 +95,8 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
           theirs = 'dot',
           both = 'dob',
           none = 'don',
-          next = ']x',
-          prev = '[x',
+          next = ']c',
+          prev = '[c',
         },
       },
     }
@@ -368,8 +368,8 @@ Example configuration: >lua
     vim.keymap.set('n', 'ct', '<Plug>(diffs-conflict-theirs)')
     vim.keymap.set('n', 'cb', '<Plug>(diffs-conflict-both)')
     vim.keymap.set('n', 'cn', '<Plug>(diffs-conflict-none)')
-    vim.keymap.set('n', ']x', '<Plug>(diffs-conflict-next)')
-    vim.keymap.set('n', '[x', '<Plug>(diffs-conflict-prev)')
+    vim.keymap.set('n', ']c', '<Plug>(diffs-conflict-next)')
+    vim.keymap.set('n', '[c', '<Plug>(diffs-conflict-prev)')
 <
 
                                                  *<Plug>(diffs-merge-ours)*
@@ -483,8 +483,8 @@ Configuration: ~
           theirs = 'dot',
           both = 'dob',
           none = 'don',
-          next = ']x',
-          prev = '[x',
+          next = ']c',
+          prev = '[c',
         },
       },
     }
@@ -555,10 +555,10 @@ Configuration: ~
         {none}               (string|false, default: 'don')
                              Reject both changes (delete entire block).
 
-        {next}               (string|false, default: ']x')
+        {next}               (string|false, default: ']c')
                              Jump to next conflict marker. Wraps around.
 
-        {prev}               (string|false, default: '[x')
+        {prev}               (string|false, default: '[c')
                              Jump to previous conflict marker. Wraps
                              around.
 
@@ -582,7 +582,7 @@ When pressing `du`/`dU` on an unmerged (`U`) file in the fugitive status
 buffer, diffs.nvim opens a unified diff of ours (`git show :2:path`) vs
 theirs (`git show :3:path`) with full treesitter and intra-line highlighting.
 
-The same conflict resolution keymaps (`doo`/`dot`/`dob`/`don`/`]x`/`[x`)
+The same conflict resolution keymaps (`doo`/`dot`/`dob`/`don`/`]c`/`[c`)
 are available on the diff buffer. They resolve conflicts in the working
 file by matching diff hunks to conflict markers:
 
@@ -590,7 +590,7 @@ file by matching diff hunks to conflict markers:
 - `dot` replaces the conflict region with theirs content
 - `dob` replaces with both (ours then theirs)
 - `don` removes the conflict region entirely
-- `]x`/`[x` navigate between unresolved conflict hunks
+- `]c`/`[c` navigate between unresolved conflict hunks
 
 Resolved hunks are marked with `(resolved)` virtual text. Hunks that
 correspond to auto-merged content (no conflict markers) show an
diff --git a/lua/diffs/init.lua b/lua/diffs/init.lua
index 2423596..6195e8e 100644
--- a/lua/diffs/init.lua
+++ b/lua/diffs/init.lua
@@ -152,8 +152,8 @@ local default_config = {
       theirs = 'dot',
       both = 'dob',
       none = 'don',
-      next = ']x',
-      prev = '[x',
+      next = ']c',
+      prev = '[c',
     },
   },
 }
diff --git a/spec/conflict_spec.lua b/spec/conflict_spec.lua
index dd190c9..9f3df5d 100644
--- a/spec/conflict_spec.lua
+++ b/spec/conflict_spec.lua
@@ -12,8 +12,8 @@ local function default_config(overrides)
       theirs = 'dot',
       both = 'dob',
       none = 'don',
-      next = ']x',
-      prev = '[x',
+      next = ']c',
+      prev = '[c',
     },
   }
   if overrides then
diff --git a/spec/merge_spec.lua b/spec/merge_spec.lua
index 6cb9f7e..5e4b854 100644
--- a/spec/merge_spec.lua
+++ b/spec/merge_spec.lua
@@ -12,8 +12,8 @@ local function default_config(overrides)
       theirs = 'dot',
       both = 'dob',
       none = 'don',
-      next = ']x',
-      prev = '[x',
+      next = ']c',
+      prev = '[c',
     },
   }
   if overrides then