Issue 4448 in pharo: Cleaning MC conflicts

Status: Accepted
Owner: [hidden email]
Labels: Milestone-1.4

New issue 4448 by [hidden email]: Cleaning MC conflicts
http://code.google.com/p/pharo/issues/detail?id=4448

MCConflict was just a wrapper on MCPatchOperation. We merged and also  
cleaned the PSM* diff related item wrappers. Now non conflicts can be  
marked as conflicts.

Attachments:
        MC2-ConflictImprovement.1.cs  15.5 KB


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

Comment #1 on issue 4448 by [hidden email]: Cleaning MC conflicts
http://code.google.com/p/pharo/issues/detail?id=4448

related to 4439 cherrypicking first fix


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

Updates:
        Status: Closed

Comment #2 on issue 4448 by [hidden email]: Cleaning MC conflicts
http://code.google.com/p/pharo/issues/detail?id=4448

in 14010


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