M .bashrc → .bashrc

@@ -14,6 +14,8 @@ cd() {
 	builtin cd "$@" && ls --color;
 }
 
+[[ -f /usr/share/bash-completion/bash_completion ]] && \
+    . /usr/share/bash-completion/bash_completion
 
 sman(){
     man `man -k . | fzf -i --reverse --height=40% --tiebreak=begin |\

M .vimrc → .vimrc

@@ -139,6 +139,11 @@ let g:winresizer_start_key = '<leader>e'
 let g:winresizer_vert_resize = 4
 let g:winresizer_horiz_resize = 2
 
+
+nmap <leader>gj :diffget //3<CR>
+nmap <leader>gf :diffget //2<CR>
+nmap <leader>gs :G<CR>
+
 " Use a blinking upright bar cursor in Insert mode, a blinking block in normal
 "if &term == 'xterm-256color' || &term == 'screen-256color'
 " let &t_SI = "\<Esc>[5 q"