Skip to content

Instantly share code, notes, and snippets.

View tvestelind's full-sized avatar

Tomas Vestelind tvestelind

5 followers · 15 following
View GitHub Profile
@tvestelind
tvestelind / keybase.md
Created October 23, 2017 12:29

Keybase proof

I hereby claim:

  • I am tvestelind on github.
  • I am tvestelind (https://keybase.io/tvestelind) on keybase.
  • I have a public key ASAjbOGTCgLp_HhEOMquLVlNGf00hPhwNJuBo4xuqxRx6go

To claim this, I am signing this object:

@tvestelind
tvestelind / vimdiffmergetool.md
Created May 21, 2019 07:48 — forked from afair/vimdiffmergetool.md
Merge/Rebase with git mergetool vimdiff usage

Using 'vimdiff' as your git mergetool

.vimrc

" vimdiff
if &diff
  map <silent> <leader>1 :diffget LOCAL<CR>
  map <silent> <leader>2 :diffget BASE<CR>
  map <silent> <leader>3 :diffget REMOTE<CR>
  map <silent> <leader>u :diffupdate<CR>

map s :wqall