FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| /* | |
| * jQuery special events for delayedEnter, delayedLeave, and delayedHover | |
| * Author: Scott Jehl, scott@filamentgroup.com | |
| * Copyright (c) 2011 Filament Group | |
| * licensed under MIT | |
| * note: Each event can be used with bind or live event handling as you would use mouseenter,mouseleave, and hover | |
| * events fire after 200ms timeout | |
| */ | |
| (function($){ | |
| //delayedEnter event |
| function hang(n) { | |
| var x = new XMLHttpRequest(); | |
| x.open('GET', 'http://hang.nodester.com/script.js?' + n, false); | |
| x.send(); | |
| } | |
| // usage: hang(2 * 1000); |
JavaScript Code
var str = "hi";Memory allocation:
| Address | Value | Description |
|---|---|---|
...... |
... |
| license: gpl-3.0 |
| # Installation | |
| brew install ffmpeg --with-vpx --with-vorbis --with-libvorbis --with-vpx --with-vorbis --with-theora --with-libogg --with-libvorbis --with-gpl --with-version3 --with-nonfree --with-postproc --with-libaacplus --with-libass --with-libcelt --with-libfaac --with-libfdk-aac --with-libfreetype --with-libmp3lame --with-libopencore-amrnb --with-libopencore-amrwb --with-libopenjpeg --with-openssl --with-libopus --with-libschroedinger --with-libspeex --with-libtheora --with-libvo-aacenc --with-libvorbis --with-libvpx --with-libx264 --with-libxvid | |
| # Easy Peasy | |
| ffmpeg -i video.mp4 video.webm |
| # Change YOUR_TOKEN to your prerender token | |
| # Change http://example.com (at the end of the last RewriteRule) to your website url | |
| <IfModule mod_headers.c> | |
| RequestHeader set X-Prerender-Token "YOUR_TOKEN" | |
| </IfModule> | |
| <IfModule mod_rewrite.c> | |
| RewriteEngine On |
| // Set up "namespace." | |
| var APP = APP || {}; | |
| // `Shared settings. | |
| //---------------------------------------------------------------------------------------------------- | |
| APP.config = APP.config || {}; | |
| // How long to keep cache, in minutes. | |
| APP.config.cache_duration = APP.config.cache_duration || 15; |
| { | |
| name:{ | |
| charname:"Zutash Zutashin", | |
| playername:"Jan Serps" | |
| }, | |
| details:{ | |
| clarrace:{ | |
| class:{ | |
| primary:"bard", | |
| secondary:"fighter" |
