rpms/mercurial/EL-4 mercurial-mergetools.hgrc.patch, NONE, 1.1 mercurial-0.9.4.tar.gz, 1.1, NONE

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18171

Added Files:
	mercurial-mergetools.hgrc.patch 
Removed Files:
	mercurial-0.9.4.tar.gz 
Log Message:
add missing patch  remove tarball


mercurial-mergetools.hgrc.patch:

--- NEW FILE mercurial-mergetools.hgrc.patch ---
--- 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
 
-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


--- mercurial-0.9.4.tar.gz DELETED ---