1 files changed, 1 insertions, 0 deletions

diff --git a/.gitconfig b/.gitconfig
index 425f6a8..8eebcf8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,6 +20,7 @@
 	refl = reflog --date=relative
 [merge]
 	tool = vimdiff
+	conflictstyle = diff3
 [push]
 	default = current
 [color]