From 172990f33e225741b098bdb0ff9a61536b3d92e2 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 20:52:50 +0200 Subject: Added nvim gitsigns extension, trying to set vimdiff with neovim --- config/nvim/lua/mappings.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/nvim/lua/mappings.lua') diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 9b1f638..242b846 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -37,3 +37,8 @@ map('n', 'l', 'SidewaysRight', {}) map('n', 'h', 'SidewaysLeft', {}) map('n', 'w', 'ArgWrap', {}) + +-- difftool +map('n', '1', 'diffget LOCAL', {}) +map('n', '2', 'diffget BASE', {}) +map('n', '3', 'diffget REMOTE', {}) -- cgit