tylocook
unread,Aug 9, 2011, 12:21:54 AM8/9/11Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to MacHg
Hello,
I am not sure if this is Snow Leopard specific, but I thought it would
be important to say that I do not have Lion installed.
I am having some bizarre behavior.
When I include the following inside of '~/Application Support/MacHG/
hgrc'...
[extdiff]
cmd.opendiff = /Applications/MacHg.app/Contents/Resources/fmdiff.sh
[merge-tools]
filemerge.executable = /Applications/MacHg.app/Contents/Resources/
opendiff-w.sh
filemerge.args = $local $other -ancestor $base -merge $output
...the FileMerge program is never opened during a conflict, and the
merge fails.
However, if I include this inside of the repository's personal /.hg/
hgrc file, it does work on the command line (but not in MacHG).
What is going on here?