cgould/config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: revert merge conflict style

Browse Source
This commit is contained in:
Charles Gould 2023-07-06 22:01:29 -04:00
parent e088a0f5f6
commit a8ec15e497
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/config
View File

@ -40,8 +40,6 @@
diffFilter = delta --color-only diffFilter = delta --color-only
[log] [log]
date = human date = human
[merge]
conflictStyle = zdiff3
[pull] [pull]
rebase = true rebase = true
[push] [push]