mergetools.hgrc: add minimal configuration for editmerge
The ``editmerge`` script is shipped in contrib and opens an editor on
every conflicting file. It needs minimal configuration to inject the
config marker in the file before opening. Otherwise it behaves the
same as ``internal:local`` and bad things happen.
to build a new macosx binary package:
install macpython from http://www.python.org/download/mac
install py2app from http://pythonmac.org/packages/
make sure /usr/local/bin is in your path
run bdist_mpkg in top-level hg directory
find packaged stuff in dist directory