[Pharo-dev] Is the merge tool broken in 30126?