# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1336454159 25200
# Node ID f919d3bf374448732b63571da0c1743606804964
# Parent  c129a719560f4c741cae0a5cab283b27118a74c7# Parent  a755319f124e2de315c61d970b5f9408f2489a68
Merged changes.

diff -r a755319f124e -r f919d3bf3744 bashrc/bashrc
--- a/bashrc/bashrc	Mon May 07 17:13:56 2012 -0700
+++ b/bashrc/bashrc	Mon May 07 22:15:59 2012 -0700
@@ -11,8 +11,8 @@
 # Mac developer binaries
 PATH=/Developer/usr/bin:$PATH
 
-# PATH for Python 2.7
-PATH=/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH
+# Python from Homebrew
+PATH=/usr/local/share/python:$PATH
 
 # Done!
 export PATH
diff -r a755319f124e -r f919d3bf3744 hgrc/hgrc
--- a/hgrc/hgrc	Mon May 07 17:13:56 2012 -0700
+++ b/hgrc/hgrc	Mon May 07 22:15:59 2012 -0700
@@ -12,6 +12,7 @@
 purge =
 fetch =
 record =
+rebase =
 convert =
 extdiff =
 schemes =