Commit b2b38c83 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Use patience algorithm for diffs

parent 999c407e

.config/git/config

+3 −0
Original line number Diff line number Diff line
@@ -31,3 +31,6 @@ 
[merge]

	conflictstyle = diff3

	defaultToUpStream = yes



[diff]

	algorithm = patience

.vimrc

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ augroup vimrc 
augroup END





" === DIFFING ===



set diffopt+=algorithm:patience

set diffopt+=iwhiteall





" === ERROR MARKER ===



noremap <silent> <Leader>cr :RemoveErrorMarkers<CR>