> I develop on OSX and the big missing feature is some decent merge tool > like Meld... Anyone got a visual merge suggestion for osx? > Try SourceGear's DiffMerge (http://sourcegear.com/diffmerge) - I use it a lot as it is a cross-platform tool and is well-suited for more complicated (diff/merge) tasks like the one you are about to embark - this tool would be of help I am sure. Failing that, Perforce's P4Merge or even Kaleidoscope (I am not sure the latter is free though!).
------------------------------------------------------------------------------ What Every C/C++ and Fortran developer Should Know! Read this article and learn how Intel has extended the reach of its next-generation tools to help Windows* and Linux* C/C++ and Fortran developers boost performance applications - including clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
