Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Warning: preg_replace(): The /e modifier is no longer supported, use preg_replace_callback instead in
/home/public/blog/wp-content/plugins/deans_code_highlighter/geshi.php on line
2147
Since Mozilla has embraced mercurial, and especially patch queues, with open arms, I get to deal with rebasing patches frequently. There are two ways this can happen – either you set up an external merge tool like meld to handle each conflict, or the rejected changes are dumped in a filename.ext.rej in the same directory […]
Posted on January 27th, 2010 by Josh Matthews
Filed under: code, emacs, mozilla | 6 Comments »