Skip to content

Instantly share code, notes, and snippets.

#!/bin/sh
#
# This script will make WinMerge your default tool for diff and merge.
# It must run inside git bash (on Windows)
#
# If your WinMerge is in other place then this one, please edit
WINMERGE_SCRIPT="~/winmerge-merge.sh"
@dkordik
dkordik / .vimrc
Created June 14, 2011 21:00 — forked from roykolak/gist:1025131
VIM config
syntax on
set tabstop=2 softtabstop=2 shiftwidth=2 expandtab smarttab
set number
set nofoldenable
set showmatch
set hlsearch
set vb
set smartindent
set nocompatible
set backspace=indent,eol,start