hmmm... Try changing in the [merge-tools] section the filemerge -> opendiff ie have:
[merge-tools]
#FileMerge
opendiff.args = $local $other -ancestor $base -merge $output
opendiff.executable = /Applications/MacHg.app/Contents/Resources/opendiff-w.sh
Cheers,
Jas