Skip to content

Instantly share code, notes, and snippets.

@haya14busa

haya14busa/.vimrc

Created November 2, 2013 11:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save haya14busa/7278072 to your computer and use it in GitHub Desktop.
Save haya14busa/7278072 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.vimrc
" Mapping for vimdiff{{{
" for git mergetool
if &diff
map <Leader>1 :diffget LOCAL<CR>
map <Leader>2 :diffget BASE<CR>
map <Leader>3 :diffget REMOTE<CR>
map <Leader>u :<C-u>diffupdate<CR>
map u u:<C-u>diffupdate<CR>
endif
"}}}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment