Skip to content

Instantly share code, notes, and snippets.

@filipposc5
Created July 4, 2016 23:08
Show Gist options
  • Select an option

  • Save filipposc5/c9c2f2916938597dab09a6d4f3650dda to your computer and use it in GitHub Desktop.

Select an option

Save filipposc5/c9c2f2916938597dab09a6d4f3650dda to your computer and use it in GitHub Desktop.
diffupdate, diffput and diffget
; (taken from someone, not mine!)
nnoremap <f8> :diffupdate<cr>
command! -nargs=? -range=1 -bar Diffput <line1>,<line2>diffput <args>|diffupdate
command! -nargs=? -range=1 -bar Diffget <line1>,<line2>diffget <args>|diffupdate
nnoremap <f3> :Diffget-
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment