jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git: Use zdiff3 conflict markers

Browse source
This commit is contained in:
Jeremy Kaplan 2024-03-18 17:03:47 -07:00
commit d94ee53c12
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git/config
View file

@ -36,7 +36,7 @@ defaultBranch = main
date = iso date = iso
[merge] [merge]
conflictStyle = diff3 conflictStyle = zdiff3
ff = only ff = only
tool = nvimdiff tool = nvimdiff