summary refs log tree commit diff
path: root/home/.config/git/config
diff options
context:
space:
mode:
Diffstat (limited to 'home/.config/git/config')
-rw-r--r--home/.config/git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index cb38682c..5780def4 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -5,6 +5,9 @@
 [commit]
     gpgSign = true
 
+[merge]
+    conflictStyle = diff3
+
 [rebase]
     autosquash = true