From cae505f5b90fda97e004167bae2665dc52081dec Mon Sep 17 00:00:00 2001 From: PHO Date: Wed, 8 Jun 2011 15:00:41 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- dot-files/_zshenv | 1 + 1 file changed, 1 insertion(+) 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" -- 2.40.0