- 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
Joshua Howland jkhowland
tony4d
/ p4merge4git.md
Created
August 24, 2012 19:00
Setup p4merge as a visual diff and merge tool for git
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // | |
| // SHK.m | |
| // ShareKit | |
| // | |
| // Created by Nathan Weiner on 6/10/10. | |
| // | |
| // Permission is hereby granted, free of charge, to any person obtaining a copy | |
| // of this software and associated documentation files (the "Software"), to deal | |
| // in the Software without restriction, including without limitation the rights |