It's true, no merge on the feature list. http://www.kaleidoscopeapp.com/
Notice the emphasis on *spotting* changes quickly. Merge is not yet supported, but I imagine it will have to in order to survive and thrive amid competitors which *do* support merging. - Quinn On Oct 11, 2010, at 9:58 AM, pSouper wrote: > really? Kaleidoscope doesn't merge? what good is a diff tool that > can't merge? i'd be surpised and shocked i it didn't allow you to > merge files - i've just bought it but haven't got around to opening > yet so i'd go as far as being discussted... i'm popping off to test it > now. > > > On Oct 6, 6:43 am, Marijn <[email protected]> wrote: >> *cough* >> >> On Sep 29, 5:17 pm, Marijn <[email protected]> wrote: >> >>> I'm having a little workflow problem with Kaleidoscope. >> >>> Unfortunately Kaleidoscope doesn't have merge support (WTF????). >>> I often need to merge changes, so I'll have to do that with good ol' >>> filemerge. >>> How do I switch easily between filemerge and kaleidoscope as diff >>> viewer from the interface in Versions? >>> Going into the preference pane every time seems a bit cumbersome... >> >>> Kindest regards, >> >>> Marijn
smime.p7s
Description: S/MIME cryptographic signature
