[user] email = {{ VCS_EMAIL }} name = {{ VCS_NAME }} [core] pager = delta [interactive] diffFilter = delta --color-only [delta] side-by-side = true navigate = true [merge] conflictStyle = zdiff3