# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263859112 18000
# Node ID 35b42a555d52362edf54457c3f70de762d48c721
# Parent  15633a0d4bd5a8b7173d26b5247e064bba0e645d
Remove merge tools.

diff -r 15633a0d4bd5 -r 35b42a555d52 .hgrc
--- a/.hgrc	Mon Jan 18 15:24:41 2010 -0500
+++ b/.hgrc	Mon Jan 18 18:58:32 2010 -0500
@@ -36,14 +36,6 @@
 [extdiff]
 cmd.fmdiff = fmdiff
 
-#[merge-patterns]
-#** = filemerge
-
-#[merge-tools]
-#filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-#filemerge.args = -left $other -right $local -ancestor $base -merge $output
-#filemerge.gui = True
-
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>