[squeak-dev] MCMergeBrowser has broken diffs
eliot.miranda at gmail.com
Fri Jan 21 00:38:06 UTC 2022
Ignore me. I was confused between a modification and a deletion. Sorry
for the noise.
On Thu, Jan 20, 2022 at 4:31 PM Eliot Miranda <eliot.miranda at gmail.com>
> 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...
More information about the Squeak-dev