diff --git a/nvim/.config/nvim/after/ftplugin/diff.vim b/nvim/.config/nvim/after/ftplugin/diff.vim deleted file mode 100644 index 7cd8bdd..0000000 --- a/nvim/.config/nvim/after/ftplugin/diff.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Jump to sections of diff -nmap [c ?^@@ -nmap ]c /^@@ diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim index 0bbf64a..47194a5 100644 --- a/nvim/.config/nvim/after/plugin/fugitive.vim +++ b/nvim/.config/nvim/after/plugin/fugitive.vim @@ -21,7 +21,3 @@ nnoremap g+ :Git stash pop:e nnoremap gs :Git nnoremap gS :Git nnoremap gw :Gwrite - -" For 3 way merge -nnoremap dl :diffget //2 -nnoremap dr :diffget //3