Neil Macy neilgmacy

## 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


## organize-photos.py
#!/usr/bin/python

import sys
import os, shutil
import subprocess
import os.path
from datetime import datetime

######################## Functions #########################
	#!/usr/bin/python

	import sys
	import os, shutil
	import subprocess
	import os.path
	from datetime import datetime

	######################## Functions #########################