Permalink
Browse files

Conflict resolution macros

  • Loading branch information...
1 parent 5862011 commit 2b06e50f8c700a4476e946562c3cae13556ef36c @yanick committed Mar 17, 2014
Showing with 7 additions and 0 deletions.
  1. +7 −0 vim/vimrc
View
@@ -435,3 +435,10 @@ if $TERM =~ '^screen-256color'
map <Esc>OF <End>
map! <Esc>OF <End>
endif
+
+" conflict resolution - pick this one / option 1 / option 2
+map <leader>. $?\v^[<=]{7}<CR>jy/\v^[=>]{7}<CR>?\v^[<]{7}<CR>"_d/\v^\>{7}<CR>"_ddP
+map <leader>< $?\v^[<]{7}<CR><leader>.
+map <leader>> $?\v^[<]{7}<CR>/\v^[=]{7}<CR><leader>.
+" ... or keep'em both
+map <leader>m $?\v^[<]{7}<CR>"_dd/\v[=]{7}<CR>cc<ESC>/\v[>]{7}<CR>"_dd

0 comments on commit 2b06e50

Please sign in to comment.