I use a Mac, and BBEdit can do merges and all fairly well. It'll let you compare the differences before the changes are done, too.
Quote:
Originally posted by FireFly
Buy Araxis Merge. It's worth every nickle! I'm just done upgrading this site (well, updating the files that is) and this program really made it easier. Much better than Beyond Compare because I don't believe the latter can automatically insert the code change into the files.
|