use the old merge dialog check the preference On Dec 12, 2010, at 3:38 PM, Damien Pollet wrote:
> On Sun, Dec 12, 2010 at 09:42, Lukas Renggli <[email protected]> wrote: >> 1. From the merge dialog you individually pick and install the changes >> that work. In the old merge dialog this works nicely. > > Actually I tried to do something like that, but the menu items were > all disabled in the merge tool. > So I guess I have the new merge dialog, yay :D > > >> Lukas >> >> On 12 December 2010 04:37, Damien Pollet <[email protected]> wrote: >>> I have a snapshot compiled against an old version of PetitParser. >>> Unfortunately one of my classes now has a conflicting inst var with >>> the most recent PetitParser, so my code does not load, MC explodes >>> instead of giving me a chance to fix the problem on the fly. Of >>> course, there are quite a few changes I'd like to rescue in that >>> snapshot. Please don't tell me I have to copy-paste them all… >>> >>> -- >>> Damien Pollet >>> type less, do more [ | ] http://people.untyped.org/damien.pollet >>> >>> >> >> >> >> -- >> Lukas Renggli >> www.lukas-renggli.ch >> >> > > > > -- > Damien Pollet > type less, do more [ | ] http://people.untyped.org/damien.pollet >
