X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4d93931d1e3fb92ca806fc8f3b2c07895430c608..227a67740a6531a0487ad3eb6d2edf3d6c9d0fb6:/gitconfig

diff --git a/gitconfig b/gitconfig
index 4f63592..4d8eb77 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,6 +7,10 @@
 
 [merge]
 	summary = true
+	tool = emerge
+
+[mergetool "emerge"]
+	path = emerge-hack
 
 [diff]
 	renames = copies
@@ -54,6 +58,7 @@
 [mail "alias"]
 	git = git@vger.kernel.org
 	mdw = mdw@distorted.org.uk
+
 [gui]
 	fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
 	fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0