Browse Source

gitconfig: add conflictstyle=diff3

main
Colin McMillen 4 months ago
parent
commit
348f62c557
  1. 2
      gitconfig

2
gitconfig

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