Andrej Pregl ws141

## web-servers.md

      
              1 file
            
          
              944 forks
            
          
              238 comments
            
          
              5996 stars
            
          
                willurd
                / web-servers.md
            
            
              Last active
              July 25, 2024 21:14
            
              
                Big list of http static server one-liners
              
          
    Each of these commands will run an ad hoc http static server in your current (or specified) directory, available at http://localhost:8000. Use this power wisely.
Discussion on reddit.
Python 2.x

$ python -m SimpleHTTPServer 8000

  
## p4merge4git.md

      
              1 file
            
          
              81 forks
            
          
              29 comments
            
          
              338 stars
            
          
                tony4d
                / p4merge4git.md
            
            
              Created
              August 24, 2012 19:00
            
              
                Setup p4merge as a visual diff and merge tool for git
              
          
    Download and install p4merge


Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool