Auto commit by The Sugar System.

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index b7742300796939ea9df97739aea8d23b77577825..a71f67df097e858666e9bf1d27c08774f41e3d05 100644 (file)
--- 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"