Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added merge conflict leader commands

  • Loading branch information...
commit fb5e76bac551ef330925785351a639e6648f7076 1 parent ea82abf
@Soares authored
Showing with 12 additions and 1 deletion.
  1. +1 −0  TODO.md
  2. +11 −1 local/mapping/plugin/leader.vim
View
1  TODO.md
@@ -1,4 +1,5 @@
# Wishlist
+Add a NewSession command
auto-format on exit. (Q?)
Make `contab -e` / `sudoedit` work nicely.
Figure out window/buffer management.
View
12 local/mapping/plugin/leader.vim
@@ -22,7 +22,12 @@
" B |
" c |
" C |
-" d |
+" d » diff mode
+" dd diff done
+" dm diffget from merge
+" dn diff next
+" dp diff prev
+" dt diffget from target
" D |
" e | CtrlP buffer
" E |
@@ -142,6 +147,11 @@ noremap <leader>bn :bn<CR>
noremap <leader>bp :bp<CR>
noremap <leader>bl :ls<CR>
noremap <leader>bt :b#<CR>
+noremap <leader>dd :only<CR>
+noremap <leader>dm :diffget //3<CR>:diffupdate<CR>
+noremap <leader>dn [c
+noremap <leader>dp ]c
+noremap <leader>dt :diffget //2<CR>:diffupdate<CR>
noremap <leader>e :CtrlPBuffer<CR>
noremap <leader>ft Vatzf
noremap <leader>ga :Gcommit --amend<CR>
Please sign in to comment.
Something went wrong with that request. Please try again.