- 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
Tosh Lyons toshism
grej
/ RankOrderCentroid.py
Created
September 6, 2012 02:39
Rank order centroid implementation for Python
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
| #------------------------------------------------------------------------------- | |
| # Name: Rank Order Centroid | |
| # Purpose: Generate rank order centroid weights | |
| # | |
| # Author: Greg Jennings | |
| # | |
| # Created: 5 Sep 2012 | |
| # Copyright: (c) Greg 2012 | |
| # Licence: MIT | |
| #------------------------------------------------------------------------------- |
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
| <!-- | |
| The MIT License (MIT) | |
| Copyright (c) 2013 [email protected] | |
| 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 | |
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| copies of the Software, and to permit persons to whom the Software is |
NewerOlder