[scm-migration-dev] wx2hg and gpyfm dependency

[Mike Kupfer]

>>>>> "Mike" == Mike Kupfer <mike.kupfer at sun.com> writes:

Mike> Okay, I'll invoke $HGMERGE if it's defined, otherwise gpyfm.

Hmm.  To be consistent with Mercurial, I guess the default should be
hgmerge, not gpyfm.

mike