diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2022-09-15 20:52:50 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2022-09-15 20:52:50 +0200 |
| commit | 172990f33e225741b098bdb0ff9a61536b3d92e2 (patch) | |
| tree | 922231f3204fa3b0f17ac007019f93c91b7d97c1 /config/nvim/lua/mappings.lua | |
| parent | 586686261a1e69a3c65e8bc9a665ef2c68bff26d (diff) | |
| download | dotfiles-172990f33e225741b098bdb0ff9a61536b3d92e2.tar.gz dotfiles-172990f33e225741b098bdb0ff9a61536b3d92e2.tar.bz2 dotfiles-172990f33e225741b098bdb0ff9a61536b3d92e2.zip | |
Added nvim gitsigns extension, trying to set vimdiff with neovim
Diffstat (limited to 'config/nvim/lua/mappings.lua')
| -rw-r--r-- | config/nvim/lua/mappings.lua | 5 |
1 files changed, 5 insertions, 0 deletions
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', '<leader>l', '<cmd>SidewaysRight<cr>', {}) map('n', '<leader>h', '<cmd>SidewaysLeft<cr>', {}) map('n', '<leader>w', '<cmd>ArgWrap<cr>', {}) + +-- difftool +map('n', '<leader>1', '<cmd>diffget LOCAL<cr>', {}) +map('n', '<leader>2', '<cmd>diffget BASE<cr>', {}) +map('n', '<leader>3', '<cmd>diffget REMOTE<cr>', {}) |
