2010/2/10 Gary Chambers <gazzaguru2@btinternet.com>
Not easy but some groundwork has already been done for that.

cool :)
�
Getting MC to use the modified code is another matter!


hahahah good point. I was just thinking in the working copy, not in MC :P
�
Regards, Gary
----- Original Message -----
Sent: Wednesday, February 10, 2010 12:14 PM
Subject: Re: [Pharo-project] Diff tools



2010/2/9 GARY CHAMBERS <gazzaguru2@btinternet.com>
New version on SqueakSource�Polymorph-Tools-Diff-gvc.20.

Descriptions added and small bug fix for merge tool (selecting next conflict now ignores "resolved" conflicts).

Merge and select incoming for each conflict to load..


Excelent!!!� Thanks Gary. Can I add something to the wishlist ?

What I would REALLY like too be able to edit code of the working copy in the merge view.

can that be done easily ?

Thanks

Mariano

�
Regards, Gary

_______________________________________________
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

_______________________________________________
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project