git: revert merge conflict style
1 files changed, 0 insertions(+), 2 deletions(-) M git/config
M git/config => git/config +0 -2
@@ 40,8 40,6 @@ diffFilter = delta --color-only [log] date = human -[merge] - conflictStyle = zdiff3 [pull] rebase = true [push]