# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1641114459 21600
# Node ID d8706e95ddeebbe23d3f4f041f72619de49b7b34
# Parent  68baaab84a0c814643acf361c6add194574b9761
Disable diffopt hiddenoff (newer default?) enable patience diff

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -204,6 +204,7 @@ set shiftwidth=2
 set shiftround
 
 set formatoptions=cqln1j
+set diffopt=internal,filler,algorithm:patience
 
 set splitright splitbelow
 set scrolloff=15