[scm-migration-dev] wx2hg and gpyfm dependency

[Mike Kupfer]

>>>>> "Bill" == Bill Sommerfeld <sommerfeld at sun.com> writes:

Bill> ideally you'd just use whatever hg merge would use.

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

mike