shawndumas

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

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge

MoOx

  //...
  $background: null; // if you don't do this, background is undefined out of the @if/else scope
  @if ($direction) {
    $background: linear-gradient($direction, $color, $color2);
  }
  @else {
    $background: linear-gradient($color, $color2);
  }
  //...
  

premasagar

// e.g. scrollToTarget(document.getElementById('foo'));

function offset(target){
	var left = 0,
		top = 0;

	while (target && target !== document.body){
		if (target.offsetLeft){
			left += target.offsetLeft;
			top  += target.offsetTop;