Filemerge
For a while I was using TextMate's "Diff" bundle to resolve subversion conflicts. And it was a pain in the arse quite frankly. The output hurt my brain and I had to re-learn how to read it every time.
Which is why I was skipping round the office and whooping when I was introduced to the relative simplicity of the "FileMerge" application. Way more visual than any other comparison tool I've used - the liquid way it keeps the line-numbers in syc across two docs is really neat. Who'd have thunk merging files could be a pleasure?
It comes bundled with the Xcode Developer Tools.
Latest Posts
iPhone App: Flick Cricket
10:15a.m., 4 Sep
Cricket seems like a ridiculous sport to me. I like hitting the ball - hitting a ball as hard as ...Javascript from the wonderful world of online advertising
8:23p.m., 1 Sep
I had a right old rant about the quality of javascript that you find being served by major providers of ...Web performance - Analysing Heart.co.uk
5:17p.m., 26 Aug
A few weeks back I, together with m'colleague Jon Topper, delivered a presentation about the performance of heart.co.uk to the ...Installing MySQL and MySQLdb on OSX
10:19a.m., 19 Aug
I've just set up my dev environment for Django. Again. This is the fourth time I've had to do it. ...