sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove git conflictstyle = zdiff3, not useful that often

Browse source
This commit is contained in:
Sami Samhuri 2025-02-06 14:05:28 -08:00
parent 73958f335f
commit 9d754bd1c4
No known key found for this signature in database
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gitconfig
View file

@ -36,7 +36,6 @@
[color] [color]
ui = auto ui = auto
[merge] [merge]
conflictstyle = zdiff3
stat = true stat = true
[rebase] [rebase]
autosquash = true autosquash = true