Use patience algorithm.
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
[core]
|
||||
preloadindex = yes
|
||||
[diff]
|
||||
algorithm = histogram
|
||||
algorithm = patience
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
[pull]
|
||||
|
||||
Reference in New Issue
Block a user