[Pharo-project] Diff tools

Stéphane Ducasse stephane.ducasse at inria.fr
Tue Feb 23 14:06:04 EST 2010


On Feb 23, 2010, at 7:04 PM, Gary Chambers wrote:

> I'll give it a go (keyboard shortcuts included) in the next DiffTools 
> version...
> I guess you won't want a warning dialog the "What you are choosing means 
> that any conflicts will be unchecked"... ;-)

:) 

> So, "use incoming for all incoming conficts" and "use current for all 
> conflicts"?

Yeap!




More information about the Pharo-dev mailing list