Diego Lemos dlresende

## vimdiff.md

      
              1 file
            
          
              98 forks
            
          
              23 comments
            
          
              580 stars
            
          
                mattratleph
                / vimdiff.md
            
            
              Last active
              October 16, 2024 17:26
                — forked from roothybrid7/vimdiff_cheet.md
            
              
                vimdiff cheat sheet
              
          
    vimdiff cheat sheet

##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

  
## README.md

      
              2 files
            
          
              0 forks
            
          
              3 comments
            
          
              5 stars
            
          
                tomgross
                / README.md
            
            
              Last active
              August 6, 2024 07:39
            
              
                Homebrew Cask for installing pCloud on a Mac
              
          
    Installing pCloud with Homebrew Cask

Since this recipe was rejected because of the volatile nature of pCloud links (see homebrew-cask#57634) I try to maintain this myself because it is useful to me and might be for others.

Download pcloud-drive.rb.
Run brew cask install pcloud-drive.rb.

To uninstall run brew cask uninstall pcloud-drive.rb.