Here the code http://code.google.com/p/pharo/issues/detail?id=4439
please tell me if it works for you. I tested on simple merge and it works fine (the changes which i marked as not applicable are not loaded). -- Best regards, Igor Stasenko AKA sig.
cherry-picking.1.cs
Description: Binary data
