diff --git a/.gitconfig b/.gitconfig index 77a8ee0..2cde3cb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,7 +13,7 @@ [core] preloadindex = yes [diff] - algorithm = patience + algorithm = minimal [merge] tool = vimdiff [pull]