[user] name = Colin McMillen email = colin@semicolin.games [init] defaultBranch = main [core] filemode = false editor = vim [merge] conflictstyle = diff3