weeheavy/dotfiles
1
1
Fork 0
Code Pull requests Activity

gitconfig: use diff3 for merges

Browse source
This commit is contained in:
Oliver Ladner 2024-08-16 10:22:22 +02:00
commit 6710a92897
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig
View file

@ -28,3 +28,5 @@
directory = /opt/homebrew directory = /opt/homebrew
[init] [init]
defaultBranch = main defaultBranch = main
[merge]
conflictstyle = diff3