Browse Source

git: use diff3 conflictstyle

Thomas Dy 3 years ago
parent
commit
84d9e56bc2
1 changed files with 2 additions and 0 deletions
  1. 2 0
      .config/git/config

+ 2 - 0
.config/git/config

@@ -1,6 +1,8 @@
 [user]
 	name = Thomas Dy
 	email = thatsmydoing@gmail.com
+[merge]
+	conflictstyle = diff3
 [core]
 	autocrlf = input
 [delta]