Jonas Cheng jonascheng

## p4merge4git.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                jonascheng
                / p4merge4git.md
            
            
              Created
              October 24, 2016 02:55
                — forked from tony4d/p4merge4git.md
            
              
                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


## term_colors.py
from __future__ import print_function
"""
Utilities for 256 color support in terminals.

Adapted from:
http://stackoverflow.com/questions/1403353/256-color-terminal-library-for-ruby

The color palette is indexed as follows:

0-15: System colors
	from __future__ import print_function
	"""
	Utilities for 256 color support in terminals.

	Adapted from:
	http://stackoverflow.com/questions/1403353/256-color-terminal-library-for-ruby

	The color palette is indexed as follows:

	0-15: System colors