use diff format available on older gits
This commit is contained in:
parent
198eebf21d
commit
1b3cb98eee
@ -14,7 +14,7 @@
|
||||
minRacyThreshold = 6379 microseconds
|
||||
[merge]
|
||||
tool = meld
|
||||
conflictstyle = zdiff3
|
||||
conflictstyle = diff3
|
||||
[review "review.lineageos.org"]
|
||||
username = jbeckmeyer
|
||||
[filter "lfs"]
|
||||
|
Loading…
Reference in New Issue
Block a user