Use patience algorithm.

This commit is contained in:
Gea-Suan Lin
2017-12-13 09:05:26 +08:00
parent fd43649b63
commit 16b66bd9db

View File

@@ -13,7 +13,7 @@
[core] [core]
preloadindex = yes preloadindex = yes
[diff] [diff]
algorithm = histogram algorithm = patience
[merge] [merge]
tool = vimdiff tool = vimdiff
[pull] [pull]