From 7f806a127d946c2ee0d7f05d5dcda63632812851 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mar 19 2009 19:11:22 +0000 Subject: add missing patch remove tarball --- diff --git a/mercurial-0.9.4.tar.gz b/mercurial-0.9.4.tar.gz deleted file mode 100644 index 95d614f..0000000 Binary files a/mercurial-0.9.4.tar.gz and /dev/null differ diff --git a/mercurial-mergetools.hgrc.patch b/mercurial-mergetools.hgrc.patch new file mode 100644 index 0000000..5a6f8fa --- /dev/null +++ b/mercurial-mergetools.hgrc.patch @@ -0,0 +1,12 @@ +--- 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