[Pharo-project] if you want to reproduce my merge conflict bug

take 10256 merge the inbox slice made by michael press conflict -> DNU Using the old merging tool I cannot keep or reject (buttons not activated) when I press diff/install I get a DNU Stef