Tyler Dane tyler-dane

## vimdiff_cheat_sheet.md

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              0 stars
            
          
        
        
          
              
          
          
            
                tyler-dane
                / vimdiff_cheat_sheet.md
            
            
              Last active
              November 29, 2017 23:52
                — forked from brbsix/vimdiff_cheat_sheet.md
            
              
                vimdiff cheat sheet
              
          
        
      
        
  
      
    vimdiff cheet sheet

git mergetool

git config --global merge.tool=vimdiff

vimdiff key mappings