Price/dots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(git): better conflict styling

Browse Source
This commit is contained in:
Price Hiller 2022-08-28 16:21:52 -05:00
parent 95e74108b5
commit 48a3abb8f6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dots/.gitconfig
View File

@ -46,3 +46,5 @@
unstage = reset HEAD -- unstage = reset HEAD --
[push] [push]
autoSetupRemote = true autoSetupRemote = true
[merge]
conflictstyle = diff3