Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

git: Change merge conflict to zdiff3 style

Browse source
This commit is contained in:
Marty Oehme 2025-02-07 13:12:47 +01:00
parent 083ef0a6ad
commit 31dc3fa9b7
Signed by: Marty
GPG key ID: EDBF2ED917B2EF6A
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vcs/git/config/git/config
View file

@ -11,7 +11,7 @@
[interactive] [interactive]
diffFilter = git delta --color-only diffFilter = git delta --color-only
[merge] [merge]
conflictstyle = diff3 conflictStyle = zdiff3
[delta] [delta]
navigate = true navigate = true
line-numbers = true line-numbers = true