--- hgmerge.orig	Tue Jun 26 04:18:18 2007
+++ hgmerge	Tue Oct  2 18:07:44 2007
@@ -37,7 +37,7 @@
 type "$PATCH" >/dev/null 2>&1 || PATCH=
 
 # find optional visual utilities
-FILEMERGE="/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge"
+FILEMERGE=
 KDIFF3="kdiff3"
 TKDIFF="tkdiff"
 MELD="meld"