$ git config --global merge.conflictstyle diff3
$ git log -p --oneline --left-right --merge
| my $path = $ARGV[0]; | |
| # print $path; | |
| open(my $file, "<", $path) or die "Unable to open file, $!"; | |
| my $contents = do { local $/; <$file> }; | |
| close $file; | |
| # print $contents; |
| { | |
| "name": "X", | |
| "fields": [ | |
| ["a", "Int"], | |
| ["b", "String?"] | |
| ] | |
| } |
| asb |
| import subprocess | |
| import re | |
| import sys | |
| if len(sys.argv) != 3: | |
| print "incorrect args" | |
| print sys.argv | |
| sys.exit(1) |
| # pack a file | |
| gzip -c workflows.tar > workflows.gzip | |
| # unpack a file | |
| gzip -c -d workflows.gzip > unzipped.tar |
| use strict; | |
| use warnings; | |
| local $/; # set slurp mode so that entire file is read at once (instead of a single line) | |
| my $content = <STDIN>; | |
| my %refs = (); | |
| foreach my $key ($content =~ m/\\ref\{([\w_]+)\}/g) { |
| 'use strict'; | |
| var genhtml = require('genhtml-js'), | |
| h = genhtml.html, | |
| s = genhtml.serialize, | |
| types = require('function-js').types; | |
| // extend Array | |
| function ArrayExt() {} | |
| ArrayExt.prototype = [1, 2, 3]; |
| [ | |
| { | |
| "problem": "ambiguity: multiple matching sequential SS", | |
| "resolution": [ | |
| [ | |
| 79, | |
| { | |
| "51": { | |
| "residueid": 20 | |
| }, |