histalek/dotfiles
histalek/dotfiles
1
0
Fork 0
Code Releases Activity

feat(git): Use 'diff3' style for merge conflicts

Browse source
This commit is contained in:
histalek 2023-11-07 15:49:34 +01:00
parent fa2f066097
commit 3bc2816c22
Signed by: histalek
SSH key fingerprint: SHA256:6a6N2Wzk73nwURUHC/ubbCyqdB6yfie0Jv/NGvRcsIE
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.config/git/config
View file

@ -46,6 +46,7 @@
[merge]
stat = true
conflictStyle = diff3
[push]
default = current