FileMerge for merging files

I’ve used FileMerge (OS X) as a nice visual diff, but until this week I hadn’t used it for merging files. Now I have, and it’s wonderful for merging files. You do all the work with the arrow keys. Up and down arrows jump to the previous or next difference. Left and right arrows pick the version you prefer for each difference. Then at the end, you save the merged file. It saved me a lot of time when I clumsily saved over something and only had a stale backup.

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s