From 2ff9cb4b7afc6541df32cf1e251bf1b2f87163c4 Mon Sep 17 00:00:00 2001
From: Neal Becker <nbecker@fedoraproject.org>
Date: Feb 07 2009 12:21:41 +0000
Subject: temporary fix for filemerge bug


---

diff --git a/mercurial-mergetools.hgrc.patch b/mercurial-mergetools.hgrc.patch
index 935c07d..5a6f8fa 100644
--- a/mercurial-mergetools.hgrc.patch
+++ b/mercurial-mergetools.hgrc.patch
@@ -1,16 +1,12 @@
---- contrib/mergetools.hgrc.orig	2008-03-24 19:05:20.000000000 -0400
-+++ contrib/mergetools.hgrc	2008-04-15 15:27:46.000000000 -0400
-@@ -1,11 +1,12 @@
- # Some default global settings for common merge tools
+--- mercurial-1.1.2/contrib/mergetools.hgrc.orig	2009-02-07 07:14:46.000000000 -0500
++++ mercurial-1.1.2/contrib/mergetools.hgrc	2009-02-07 07:14:15.000000000 -0500
+@@ -46,6 +46,6 @@
+ ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ ecmerge.gui=True
  
- [merge-tools]
--kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
-+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
- kdiff3.regkey=Software\KDiff3
- kdiff3.regappend=\kdiff3.exe
- kdiff3.fixeol=True
- kdiff3.gui=True
-+kdiff3.priority=1
- 
- gvimdiff.args=--nofork -d -g -O $local $other $base
- gvimdiff.regkey=Software\Vim\GVim
+-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+-filemerge.args=-left $other -right $local -ancestor $base -merge $output
+-filemerge.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