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