diff --git a/user.conf.example b/user.conf.example index bc9ff3d..253a07d 100644 --- a/user.conf.example +++ b/user.conf.example @@ -4,8 +4,19 @@ [core] editor = mcedit - pager = less -R + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + light = false # set to true if you're in a terminal w/ a light background color + side-by-side = true [merge] - tool = meld + tool = delta + conflictstyle = diff3 +[diff] + colorMoved = default