mcmillen/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gitconfig: add conflictstyle=diff3

Browse Source
This commit is contained in:
Colin McMillen 2021-06-09 13:10:08 -04:00
parent 4d8ed3bacb
commit 348f62c557
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitconfig
View File

@ -3,3 +3,5 @@
email = colin@semicolin.games email = colin@semicolin.games
[init] [init]
defaultBranch = main defaultBranch = main
[merge]
conflictstyle = diff3