vim: use internal patience diff algorithm

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6b2c8abe0a4a9974943cab2f4443750b32965f62..79944d1cf6554e4a7ecf80853be28a095c6e80fd 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -265,6 +265,8 @@ set viewoptions+=folds          " save folds
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes

+set diffopt+=internal
+set diffopt+=algorithm:patience

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines