steve/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(git): use zdiff3 conflict style for cleaner diffs

Browse Source
This commit is contained in:
gitadmin
2026-09-24 15:59:47 -04:00
parent 8086430934
commit e7b19ee993
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/git/config
+1 -1
View File
@@ -53,7 +53,7 @@ pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(
layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
[merge] [merge]
conflictStyle = diff3 conflictStyle = zdiff3
summary = true summary = true
verbosity = 1 verbosity = 1
tool = nvimdiff tool = nvimdiff