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