From 1dfcc85f93036ae417ea63d2c373892b6b4c8d5d Mon Sep 17 00:00:00 2001
From: qsdrqs <qsdrqs@gmail.com>
Date: Sat, 3 May 2025 17:44:45 -0500
Subject: [PATCH] fix(mappings): fix editor commands invokation (#103)

---
 lua/git-conflict.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lua/git-conflict.lua b/lua/git-conflict.lua
index 7e22434..70acd06 100644
--- a/lua/git-conflict.lua
+++ b/lua/git-conflict.lua
@@ -500,13 +500,13 @@ local function set_commands()
       end
     end)
   end, { nargs = 0 })
-  command('GitConflictChooseOurs', '<Plug>(git-conflict-ours)', { nargs = 0 })
-  command('GitConflictChooseTheirs', '<Plug>(git-conflict-theirs)', { nargs = 0 })
-  command('GitConflictChooseBoth', '<Plug>(git-conflict-both)', { nargs = 0 })
-  command('GitConflictChooseBase', '<Plug>(git-conflict-base)', { nargs = 0 })
-  command('GitConflictChooseNone', '<Plug>(git-conflict-none)', { nargs = 0 })
-  command('GitConflictNextConflict', '<Plug>(git-conflict-next-conflict)', { nargs = 0 })
-  command('GitConflictPrevConflict', '<Plug>(git-conflict-prev-conflict)', { nargs = 0 })
+  command('GitConflictChooseOurs', function() M.choose('ours') end, { nargs = 0 })
+  command('GitConflictChooseTheirs', function() M.choose('theirs') end, { nargs = 0 })
+  command('GitConflictChooseBoth', function() M.choose('both') end, { nargs = 0 })
+  command('GitConflictChooseBase', function() M.choose('base') end, { nargs = 0 })
+  command('GitConflictChooseNone', function() M.choose('none') end, { nargs = 0 })
+  command('GitConflictNextConflict', function() M.find_next('ours') end, { nargs = 0 })
+  command('GitConflictPrevConflict', function() M.find_prev('ours') end, { nargs = 0 })
 end
 
 -----------------------------------------------------------------------------//