# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263164470 18000
# Node ID 97bf431de3e66df86b232e5da6615881449a7853
# Parent  c924e638ae4ba12a9e070af100f9264fa86626a8
Add filemerge as a merge tool.

diff -r c924e638ae4b -r 97bf431de3e6 .hgrc
--- a/.hgrc	Sun Jan 10 14:19:16 2010 -0500
+++ b/.hgrc	Sun Jan 10 18:01:10 2010 -0500
@@ -35,6 +35,14 @@
 [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>