feat(gitconfig): use diff3 conflict style

xatier · Oct 21, 2024 · e2519b1 · e2519b1
1 parent a57c400
commit e2519b1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gitconfig b/gitconfig
@@ -51,6 +51,7 @@
 [help]
 	autocorrect = 30
 [merge]
+	conflictstyle = diff3
 	tool = vimdiff
 [pull]
 	rebase = true