- 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
Francisco Troncoso ftroncosom
ftroncosom
/ p4merge4git.md
Last active
September 3, 2015 13:30
— forked from tony4d/p4merge4git.md
Setup p4merge as a visual diff and merge tool for git
ftroncosom
/ README.md
Last active
August 29, 2015 14:24
— forked from magnetikonline/README.md
Linux installation notes (tested under Ubuntu 14.04LTS/12.04LTS), assuming VirtualBox is already installed on host.
ftroncosom
/ nginx_userdir.conf
Created
November 18, 2013 19:20
— forked from btbytes/nginx_userdir.conf
This file contains hidden or 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
| ## REF: http://blog.sbf5.com/?p=6 | |
| # For requests starting with a tilde, break them into three components: | |
| # 1. The username, everything after the tilde up to the first slash | |
| # 2. The file location, everything after the username up to the last slash | |
| # 3. The trailing slash(es) | |
| # Then, rewrite to go to the f~/ branch. | |
| location /~ { | |
| if ($request_uri ~ ^/~([^/]*)(/.*[^/]|)(/*)$) { | |
| set $homedir $1; | |
| set $filedir $2; |
ftroncosom
/ widget-template.js
Created
September 5, 2013 13:59
— forked from ehynds/widget-template.js
This file contains hidden or 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
| (function($){ | |
| $.widget("ui.mywidget", { | |
| options: { | |
| autoOpen: true | |
| }, | |
| _create: function(){ | |
| // by default, consider this thing closed. |
NewerOlder