git: Set merge.conflictstyle to diff3

Display original text in addition to changes from both sides.
2024-09-21 00:03:34 +02:00
parent ea2a02626d
commit d30b102e42
1 changed files with 1 additions and 0 deletions
--- a/.config/git/config
+++ b/.config/git/config
@@ -87,6 +87,7 @@
 [log]
 	follow = true
 [merge]
+	conflictstyle = diff3
 	log = true
 	suppressDest = *
 [pretty]