[user]
	name = Colin McMillen
	email = colin@semicolin.games
[init]
	defaultBranch = main
[merge]
	conflictstyle = diff3