From 46e68bd9815a6a8c454bf9105b6ebe2d75f54045 Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Wed, 22 May 2024 17:23:40 +0100
Subject: [nvim] Fix git-conflict.nvim mappings

---
 home/.config/nvim/lua/custom/plugins/git.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'home/.config/nvim/lua/custom/plugins/git.lua')

diff --git a/home/.config/nvim/lua/custom/plugins/git.lua b/home/.config/nvim/lua/custom/plugins/git.lua
index adc584c..02df02e 100644
--- a/home/.config/nvim/lua/custom/plugins/git.lua
+++ b/home/.config/nvim/lua/custom/plugins/git.lua
@@ -1,7 +1,15 @@
 local map = require("mapper")
 
 return {
-  { 'akinsho/git-conflict.nvim', config = true },
+  {
+    'akinsho/git-conflict.nvim',
+    opts = {
+      default_mappings = {
+        next = ']x',
+        prev = '[x',
+      },
+    }
+  },
   {
     "NeogitOrg/neogit",
     dependencies = {
-- 
cgit v1.2.3-70-g09d2