1 files changed, 3 insertions, 1 deletions

diff --git a/.gitconfig b/.gitconfig
index dfb30c9..04e9618 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Tom Willemsen
-	email = ryuslash@gmail.com
+	email = tom@ryuslash.org
 [core]
 	editor = emacs -nw
 [color]
@@ -15,3 +15,5 @@
 	smtpserver = smtp.gmail.com
 	smtpuser = ryuslash@gmail.com
 	smtpserverport = 587
+[merge]
+	tool = emerge