14010
-----

-  Issue 4439:  Allow cherry-picking when merging. Second part removing 
MCConflict. 
        http://code.google.com/p/pharo/issues/detail?id=4439
-  Issue 4448:  Cleaning MC conflicts

Stef and Igor

Reply via email to