wx2hg assumes that gpyfm is available for doing any necessary 3-way merges. If we keep that simple dependency, then I can't putback wx2hg into onnv-gate before gpyfm lands in the gate.
One alternative would be for wx2hg to see what's available and use filemerge if gpyfm isn't there. Another alternative would be to let users plug in their favorite 3-way merge tool, such as the text-based thing that Dave Powell recently wrote. Preferences? I don't want to spend much more time on bells and whistles for wx2hg, but I'd also like to finish it up, put it back, and move on to other stuff. mike PS. I've attached the most recent man page. -------------- next part -------------- A non-text attachment was scrubbed... Name: wx2hg.pdf Type: application/pdf Size: 4947 bytes Desc: wx2hg man page URL: <http://mail.opensolaris.org/pipermail/scm-migration-dev/attachments/20070813/42003e0d/attachment.pdf>
