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

_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project