diff --git a/.gitconfig b/.gitconfig index c57def3..b81d9fe 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,7 +13,7 @@ [core] preloadindex = yes [diff] - algorithm = histogram + algorithm = patience [merge] tool = vimdiff [pull]