# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1249513008 14400
# Node ID 37fd5c85e148e61a270aaccf75ed877c322259e1
# Parent  0d5d0aa3961c7adf94ce87ae76714f867fa1977c
Add the extdiff for filemerge.

diff -r 0d5d0aa3961c -r 37fd5c85e148 .bashrc
--- a/.bashrc	Thu Jul 30 06:53:08 2009 -0400
+++ b/.bashrc	Wed Aug 05 18:56:48 2009 -0400
@@ -14,7 +14,7 @@
 
 # Environment variables ------------------------------------------------------
 export EDITOR='vim'
-export PATH="/usr/local/bin:${PATH}:/opt/local/bin"
+export PATH="/usr/local/bin:~/lib/fmscripts:${PATH}:/opt/local/bin"
 export WORKON_HOME="${HOME}/lib/virtualenvs"
 export PIP_VIRTUALENV_BASE=$WORKON_HOME
 export GREP_OPTIONS='--color=auto'
diff -r 0d5d0aa3961c -r 37fd5c85e148 .hgrc
--- a/.hgrc	Thu Jul 30 06:53:08 2009 -0400
+++ b/.hgrc	Wed Aug 05 18:56:48 2009 -0400
@@ -11,7 +11,8 @@
 hgext.mq = 
 hgext.patchbomb =
 hgext.convert = 
-hgext.transplant = 
+hgext.transplant =
+hgext.extdiff = 
 color = 
 parentrevspec =
 hgshelve = ~/lib/hg/hgshelve/hgshelve.py
@@ -28,6 +29,9 @@
 [diff]
 git = True
 
+[extdiff]
+cmd.fmdiff = fmdiff
+
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>