[Pharo-project] Diff tools

Gary Chambers gazzaguru2 at btinternet.com
Tue Feb 23 10:40:08 EST 2010


If you can describe exactly what you wish I'm sure it can be done ;-) ...
Remember, conflicts are conflicts and *should* be checked on a one-by-one 
basis when merging.

Regards, Gary

----- Original Message ----- 
From: "Stéphane Ducasse" <stephane.ducasse at inria.fr>
To: <Pharo-project at lists.gforge.inria.fr>
Sent: Thursday, February 11, 2010 7:57 AM
Subject: Re: [Pharo-project] Diff tools


> 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
>> Pharo-project at lists.gforge.inria.fr
>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
>
>
> _______________________________________________
> Pharo-project mailing list
> Pharo-project at lists.gforge.inria.fr
> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project 





More information about the Pharo-dev mailing list