From: PHO <pho@cielonegro.org>
Date: Wed, 8 Jun 2011 06:00:41 +0000 (+0900)
Subject: Auto commit by The Sugar System.
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=cae505f5b90fda97e004167bae2665dc52081dec;p=sugar.git

Auto commit by The Sugar System.
---

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index b774230..a71f67d 100644
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -77,6 +77,7 @@ export LV="-Ia -c"
 export LESS="--quit-if-one-screen -R"
 export GTK_IM_MODULE=uim
 export PERL_BADLANG=0
+export HGMERGE=merge
 
 # darcs
 export DARCS_EMAIL="pho@cielonegro.org"