Add the extdiff for filemerge.
author |
Steve Losh <steve@stevelosh.com> |
date |
Wed, 05 Aug 2009 18:56:48 -0400 |
parents |
0d5d0aa3961c
|
children |
c051bec803d4
|
branches/tags |
(none) |
files |
.bashrc .hgrc |
Changes
--- 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'
--- 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>