Hi,

    I'm merging a VMMaker.oscog commit into an image with an experiment in
progress.  Two methods are hence in conflict.  In the MCMergeBrowser these
two methods show only the in-image variant, not the diff of the in-image
and incoming methods, as was previously (and must be) the case.  This is
after ==========  Update of trunk completed:  21017 -> 21069 ==========
_,,,^..^,,,_
best, Eliot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20220120/486840a2/attachment.html>