bb44f2206b1c

--- a/.hgrc	Mon Dec 27 14:33:14 2010 -0500
+++ b/.hgrc	Mon Dec 27 16:10:25 2010 -0500
@@ -48,15 +48,17 @@
 [extdiff]
 cmd.vd = mvim
 opts.vd = -c 'set lines=70' -c 'set columns=240' -f '+next' '+execute "DirDiff" argv(0) argv(1)'
-cmd.kd = /usr/local/bin/ksdiff-wrapper
-opts.kd = hg
 cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
 opts.ksdiff = hg
-cmd.sleep = /bin/sleep
-opts.sleep = 30 #
+cmd.dd = diffuse
+opts.dd = 
 
-[alias]
-kk = !/opt/local/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python /opt/local/bin/hg kd $@
+[merge-tools]
+diffuse.priority=-3
+diffuse.args=$local $base $other
+diffuse.gui=True
+diffuse.diffargs=$parent $child
+
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>
@@ -108,7 +110,8 @@
 fdiff = diff -U 10000000000000
 qfdiff = qdiff -U 10000000000000
 
-ks = kd -c
+kd = !/opt/local/bin/hg ksdiff $@
+ks = !/opt/local/bin/hg ksdiff -c $@
 
 dlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
 _ = dlog -l15