diff --git a/home/vim/init.vim b/home/vim/init.vim
index 259c782..4d8b85d 100644
--- a/home/vim/init.vim
+++ b/home/vim/init.vim
@@ -66,6 +66,11 @@ set list
 " Show a tab as an arrow, trailing spaces as ¤, non-breaking spaces as dots
 set listchars=tab:>─,trail:·,nbsp:¤
 
+" Use patience diff
+set diffopt+=algorithm:patience
+" Align similar lines in each hunk
+set diffopt+=linematch:50
+
 " Don't redraw when executing macros
 set lazyredraw