Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshenv

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index b7742300796939ea9df97739aea8d23b77577825..ad43120dca946e7bfbb5b4596a54fa338401ee0a 100644 (file)
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -23,6 +23,8 @@ append_path PATH /usr/bin
 append_path PATH /usr/sbin
 append_path PATH /usr/local/bin
 append_path PATH /usr/local/sbin
+append_path PATH /opt/local/bin
+append_path PATH /opt/local/sbin
 append_path PATH /usr/pkg/bin
 append_path PATH /usr/pkg/sbin
 append_path PATH /usr/pkg/lib/perl5/site_perl/bin
@@ -30,6 +32,8 @@ append_path PATH $HOME/bin
 # Hope these could be removed someday!
 append_path PATH /usr/local/ymir/perl/bin
 append_path PATH /usr/local/ymir/erlang/bin
+append_path PATH /usr/local/ymir/postgresql90/bin
+append_path PATH /usr/local/ymir/mercurial/bin
 
 # MANPATH
 export MANPATH=""
@@ -77,6 +81,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"