From 34f2273c94fc9a390800c9774c5fa1a76e700fc1 Mon Sep 17 00:00:00 2001
From: Eric Langlois <eric.langlois@sanctuary.ai>
Date: Fri, 3 Nov 2023 17:04:11 -0700
Subject: [PATCH] vim: vimdiff \[123] mappings for choice

---
 src/config/vim/plugin/mappings.vim | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/config/vim/plugin/mappings.vim b/src/config/vim/plugin/mappings.vim
index c15ed56..f5fc2f5 100644
--- a/src/config/vim/plugin/mappings.vim
+++ b/src/config/vim/plugin/mappings.vim
@@ -87,17 +87,24 @@ onoremap al{ :<c-u>normal! F}va}<cr>
 " Enable buffer display on airline
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#buffer_idx_mode = 1
-nmap <leader>1 <Plug>AirlineSelectTab1
-nmap <leader>2 <Plug>AirlineSelectTab2
-nmap <leader>3 <Plug>AirlineSelectTab3
-nmap <leader>4 <Plug>AirlineSelectTab4
-nmap <leader>5 <Plug>AirlineSelectTab5
-nmap <leader>6 <Plug>AirlineSelectTab6
-nmap <leader>7 <Plug>AirlineSelectTab7
-nmap <leader>8 <Plug>AirlineSelectTab8
-nmap <leader>9 <Plug>AirlineSelectTab9
-nmap <leader>- <Plug>AirlineSelectPrevTab
-nmap <leader>+ <Plug>AirlineSelectNextTab
+nnoremap <leader>1 <Plug>AirlineSelectTab1
+nnoremap <leader>2 <Plug>AirlineSelectTab2
+nnoremap <leader>3 <Plug>AirlineSelectTab3
+nnoremap <leader>4 <Plug>AirlineSelectTab4
+nnoremap <leader>5 <Plug>AirlineSelectTab5
+nnoremap <leader>6 <Plug>AirlineSelectTab6
+nnoremap <leader>7 <Plug>AirlineSelectTab7
+nnoremap <leader>8 <Plug>AirlineSelectTab8
+nnoremap <leader>9 <Plug>AirlineSelectTab9
+nnoremap <leader>- <Plug>AirlineSelectPrevTab
+nnoremap <leader>+ <Plug>AirlineSelectNextTab
+
+" Vimdiff
+if &diff
+	nnoremap <leader>1 :diffget LOCAL<CR>
+	nnoremap <leader>2 :diffget BASE<CR>
+	nnoremap <leader>3 :diffget REMOTE<CR>
+endif
 
 " Sort
 vnoremap <leader>s :sort i<cr>