# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 2008-11-17 04:56:55
# Node ID 8119c1a607c49f4ea8968d67ab8984119fda26cf
# Parent  62b75d73c33d2cb93d4c3aa38fb3af2928f337fa

mergetools: add pointer to the usual filemerge path

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -46,5 +46,6 @@ ecmerge.args=$base $local $other --mode=
 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
 ecmerge.gui=True
 
+filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True