Dan Kordik dkordik
dkordik
/ git-mergetool-winmerge-setup.sh
Last active
April 19, 2018 19:04
— forked from MarkusObrist/git-mergetool-winmerge-setup.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |