shawndumas

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge

andreabalducci

(function (){
    var UpdateContext = window.UpdateContext = window.UpdateContext || {};

    var isWinJS = typeof(MSApp) != 'undefined';

    if(isWinJS){
        UpdateContext.Execute = function(cb){
            MSApp.execUnsafeLocalFunction(cb);
        };
    }else{

DGuidi

L.TileLayer.TileJSON = L.TileLayer.Canvas.extend({
    options: {
        debug: false
    },

    tileSize: 256,

    initialize: function (options) {
        L.Util.setOptions(this, options);