From a481eb656812ba084065a24cafbdea85b94a5a66 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 3 Dec 2011 16:22:46 +0100
Subject: GIT & XDEFAULTS: email adress, merge tool, colors

Git:
email address has been changed and the merge tool has been set to
emerge (as trial).

Xdefaults:
Changed the colors.
---
 .gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.gitconfig')

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
-- 
cgit v1.3-2-g0d8e