Fwd: I could not merge with

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Fwd: I could not merge with

Stéphane Ducasse


the old diff tool either.

MCMergeBrowser>>diffSelection
        diffSelection "Open a diff browser on the selection."
                 selection ifNotNil:
                [selection diff]

selection was a MCConflict so did not understand diff.

I could not press on keep or reject on bold (changed) items

stef





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