Mercurial > hg-stable

changeset 7385:8119c1a607c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: add pointer to the usual filemerge path
author Brendan Cully <brendan@kublai.com>
date Sun, 16 Nov 2008 20:56:55 -0800
parents 62b75d73c33d
children 86bfd65532ac
files contrib/mergetools.hgrc
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Sun Nov 16 19:49:36 2008 -0800
+++ b/contrib/mergetools.hgrc	Sun Nov 16 20:56:55 2008 -0800
@@ -46,5 +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