Tomas Vestelind tvestelind

## vimdiffmergetool.md

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              0 stars
            
          
        
        
          
              
          
          
            
                tvestelind
                / vimdiffmergetool.md
            
            
              Created
              May 21, 2019 07:48
                — forked from afair/vimdiffmergetool.md
            
              
                Merge/Rebase with git mergetool vimdiff usage
              
          
        
      
        
  
      
    Using 'vimdiff' as your git mergetool

.vimrc

" vimdiff
if &diff
  map <silent> <leader>1 :diffget LOCAL<CR>
  map <silent> <leader>2 :diffget BASE<CR>
  map <silent> <leader>3 :diffget REMOTE<CR>
  map <silent> <leader>u :diffupdate<CR>

map  s :wqall