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

gitconfig disable diff3

Browse Source
This commit is contained in:
Henrik Bakken
2025-09-10 21:25:47 +02:00
parent 965e5a16f9
commit 517d0111aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HOME/.gitconfig
+2 -2
View File
@@ -13,8 +13,8 @@
required = true required = true
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[merge] ; [merge]
conflictstyle = diff3 ; conflictstyle = diff3
[delta] [delta]
navigate = true navigate = true
light = false light = false