rpms/mercurial/devel mercurial-mergetools.hgrc.patch,1.1,1.2

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30047

Modified Files:
	mercurial-mergetools.hgrc.patch 
Log Message:
temporary fix for filemerge bug


mercurial-mergetools.hgrc.patch:

Index: mercurial-mergetools.hgrc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial-mergetools.hgrc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercurial-mergetools.hgrc.patch	16 Apr 2008 11:10:59 -0000	1.1
+++ mercurial-mergetools.hgrc.patch	7 Feb 2009 12:21:41 -0000	1.2
@@ -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