Enable histogram diff algorithm for git
This commit is contained in:
parent
e08fd8ef13
commit
63ea306c34
@ -7,8 +7,8 @@
|
|||||||
# https://jvns.ca/blog/2024/02/16/popular-git-config-options/#merge-conflictstyle-zdiff3
|
# https://jvns.ca/blog/2024/02/16/popular-git-config-options/#merge-conflictstyle-zdiff3
|
||||||
#[merge]
|
#[merge]
|
||||||
# conflictstyle = zdiff3
|
# conflictstyle = zdiff3
|
||||||
#[diff]
|
[diff]
|
||||||
# algorithm = histogram
|
algorithm = histogram
|
||||||
#[branch]
|
#[branch]
|
||||||
# sort = -committerdate
|
# sort = -committerdate
|
||||||
#[tag]
|
#[tag]
|
||||||
|
Loading…
Reference in New Issue
Block a user