Skip to content

Instantly share code, notes, and snippets.

@podlipensky
podlipensky / 1.js
Created February 23, 2013 16:34 — forked from padolsey/1.js
/x/==x
@podlipensky
podlipensky / .gitconfig
Created August 23, 2012 23:40 — forked from orj/.gitconfig
Using p4merge as Git mergetool on Mac OS X.
[merge]
keepBackup = false
tool = custom
[mergetool "custom"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false