From c96d607a269c2b65d6a1191a5d4119eb7efc59f2 Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <vn.mcsinyx@gmail.com>
Date: Tue, 18 Dec 2018 11:14:47 +0700
Subject: Update 2018-12-18

---
 vim/.vim/vimrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'vim/.vim/vimrc')

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
-- 
cgit 1.4.1