gitconfig: add conflictstyle=diff3

2021-06-09 13:10:08 -04:00 · 2021-06-09 13:10:08 -04:00 · 348f62c557
commit 348f62c557
parent 4d8ed3bacb
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -3,3 +3,5 @@
 	email = colin@semicolin.games
 [init]
 	defaultBranch = main
+[merge]
+	conflictstyle = diff3