# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1267462068 18000
# Node ID c7536eed5cc86e42e578323e64165f01ebd958a3
# Parent  ed5d800d4a8aae539e2258875c23fd83be4cf076# Parent  c4483b80c57200eddbd3d08d0a988692c5ac2816
Merge with personal settings.

diff -r c4483b80c572 -r c7536eed5cc8 .hgrc
--- a/.hgrc	Sat Feb 27 16:52:58 2010 -0500
+++ b/.hgrc	Mon Mar 01 11:47:48 2010 -0500
@@ -18,6 +18,7 @@
 paste = ~/lib/hg/hg-paste/paste.py
 prompt = ~/lib/hg/hg-prompt/prompt.py
 histedit = ~/lib/hg/histedit
+hgsubversion = ~/lib/hg/hgsubversion/hgsubversion
 hggit = ~/lib/hg/hg-git/hggit
 collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
 review = ~/lib/hg/hg-review/review
diff -r c4483b80c572 -r c7536eed5cc8 .zshrc
--- a/.zshrc	Sat Feb 27 16:52:58 2010 -0500
+++ b/.zshrc	Mon Mar 01 11:47:48 2010 -0500
@@ -26,6 +26,7 @@
 export EDITOR='vim'
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
 export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
+export PATH="/opt/subversion/bin:${PATH}"
 export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
 export WORKON_HOME="${HOME}/lib/virtualenvs"
 export GREP_OPTIONS='--color=auto'