X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/bd67e4dc5d06f455a9914e4c1208a3588bc0c6a0..c2c256b7c6b49be7c2084ba6028539f3f8640684:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index b682839..1dbc92b 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -18,6 +18,7 @@
 [merge]
 	summary = true
 	tool = emerge
+	conflictStyle = diff3
 
 [mergetool "emerge"]
 	path = emerge-hack
@@ -39,6 +40,7 @@
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"