| DELIMITER $$ | |
| CREATE FUNCTION maybe_utf8_decode(str text charset utf8) | |
| RETURNS text CHARSET utf8 DETERMINISTIC | |
| BEGIN | |
| declare str_converted text charset utf8; | |
| declare max_error_count int default @@max_error_count; | |
| set @@max_error_count = 0; | |
| set str_converted = convert(binary convert(str using latin1) using utf8); | |
| set @@max_error_count = max_error_count; |
| /*jslint undef: true, nomen: true, eqeqeq: true, plusplus: true, newcap: true, immed: true, browser: true, devel: true, passfail: false */ | |
| /*global window: false, readConvertLinksToFootnotes: false, readStyle: false, readSize: false, readMargin: false, Typekit: false, ActiveXObject: false */ | |
| var dbg = (typeof console !== 'undefined') ? function(s) { | |
| console.log("Readability: " + s); | |
| } : function() {}; | |
| /* | |
| * Readability. An Arc90 Lab Experiment. | |
| * Website: http://lab.arc90.com/experiments/readability |
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.
| ּ_בּ | |
| בּ_בּ | |
| טּ_טּ | |
| כּ‗כּ | |
| לּ_לּ | |
| מּ_מּ | |
| סּ_סּ | |
| תּ_תּ | |
| ٩(×̯×)۶ | |
| ٩(̾●̮̮̃̾•̃̾)۶ |
