about summary refs log tree commit diff
path: root/vim/.vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/.vim/vimrc')
-rwxr-xr-xvim/.vim/vimrc1
1 files changed, 1 insertions, 0 deletions
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index ac9bf51..a0f9965 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -11,6 +11,7 @@ set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab
 set dictionary=/usr/share/dict/words
 set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 set omnifunc=syntaxcomplete#Complete
+set diffopt+=algorithm:patience
 autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
 autocmd FileType c,h,go setlocal cindent noexpandtab shiftwidth=8