Permalink
Browse files

Find merge conflicts; remove the vbell

  • Loading branch information...
1 parent 872e316 commit 339c89f65eb280dc4a732054a1e215359779e208 @almet committed Nov 14, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 .vimrc
View
5 .vimrc
@@ -22,7 +22,7 @@ set showcmd
set hidden
set wildmenu
set wildmode=list:longest
-set visualbell
+set novisualbell
set cursorline
set ttyfast
set ruler
@@ -130,6 +130,9 @@ map <Leader>1 yypVr=
map <Leader>2 yypVr-
map <Leader>3 yypVr~
+" find merge conflicts
+map <Leader>m /\<\<<CR>
+
map <silent> <Leader>n ]S
map <silent> <Leader>p [S

0 comments on commit 339c89f

Please sign in to comment.