dotfiles/gitconfig

[user]
	name = Colin McMillen
	email = colin@semicolin.games
[init]
	defaultBranch = main
[merge]
	conflictstyle = diff3
add gitconfig 2021-05-12 15:50:21 +00:00			`[user]`
			`name = Colin McMillen`
			`email = colin@semicolin.games`
gitconfig: set default branch to "main" 2021-05-12 15:53:40 +00:00			`[init]`
			`defaultBranch = main`
gitconfig: add conflictstyle=diff3 2021-06-09 17:10:08 +00:00			`[merge]`
			`conflictstyle = diff3`