If you have a Mac and you need to merge some files, you might want to check out this utility that comes with the free developer tools:
/Developer/Applications/Utilities/FileMerge.app
Basic merge functionality, but it's simple and gets the job done.
Re:Command-line
cbrandtbuffalo on 2007-05-02T12:16:06
Ah, so it does. Thanks for the tip!:)