gary do we have resolved all conflict by taking the incoming? and the inverse because in the old diff tools we could and this is handy.
On Feb 9, 2010, at 4:24 PM, GARY CHAMBERS wrote: > 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.. > > Regards, Gary > _______________________________________________ > Pharo-project mailing list > [email protected] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
