On 23/05/2011 18:07, Tom Eastep wrote: > On 5/23/11 9:39 AM, Mr Dash Four wrote: >> >>> 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!). > > Thanks for the tip -- I just installed DiffMerge.
I finally tried vimdiff. OK, I have a love/hate affair with vim, but since I mostly develop in a console it's handy Seems you get a good left/right diff, and dp/do push/pull the diffs each way. Ed W ------------------------------------------------------------------------------ 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
