On Thu, Nov 30, 2006 at 05:35:26PM +0000, Darren J Moffat wrote: > James Falkner wrote: > >Darren J Moffat wrote: > >>One of the reasons I'm doing this is I believe we need a GUI merge program > >>to > >>be shipped by default and I'm trying to find one that suits the Solaris > >>distribution of OpenSolaris. > >> > >>Does anyone have other suggestions to try ? > >Two other possibilities come to mind: gvim (in diff mode) > > Hmn now since I'm a vim user..... That hadn't crossed my mind.
I've been looking for a 3-way merge vim plugin, but I don't think there is one. Diff mode can do more than two windows, but I'm not sure that it's really useful for this. Still, if you find (or write!) one, we should definitely include it. > >and kdiff3. Screenshots for kdiff3 look impressive > >http://kdiff3.sourceforge.net/doc/screenshots.html > > Yeah but it drags in libqt and Solaris doesn't have that. Some other distros > do but Solaris doesn't and I just don't want to open that can of worms. If there's demand, Stefan Teleman might add it. It's currently on the Companion, but if kdiff3 is good enough, maybe it's worth including QT in the WOS. Danek _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org
