From 16b66bd9dbe2281d84bedf3b8820ffc8a0db9f72 Mon Sep 17 00:00:00 2001 From: Gea-Suan Lin Date: Wed, 13 Dec 2017 09:05:26 +0800 Subject: [PATCH] Use patience algorithm. --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]