merge: let _resolvetrivial() work on the file->action dict
By moving the conversion from the file->action dict after
_resolvetrivial(), we greatly simplify and clarify that method.
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