Perhaps the "non-applicable" could be streamlined.
I.e., "keep current version" = not applicable.
No need for the extra menu item then.
Regards, Gary
----- Original Message -----
From: "Igor Stasenko" <[email protected]>
To: <[email protected]>
Sent: Wednesday, June 22, 2011 3:40 PM
Subject: Re: [Pharo-project] Merge tool. No way to cherry pick the changes?
Here the code
http://code.google.com/p/pharo/issues/detail?id=4439
please tell me if it works for you.
I tested on simple merge and it works fine (the changes which i marked
as not applicable are not loaded).
--
Best regards,
Igor Stasenko AKA sig.
