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
Muppets Birthday Card
5:47p.m., 28 Nov
Emma loves The Muppets. She even has her own Muppet who we call Emma Too and who was born at ...Detecting Online Status In The Browser
11:55a.m., 28 Nov
I was just heading into a meeting when I was asked how our (mostly web-based) iOS application was going to ...Dropping Support for Internet Explorer 6
2:37p.m., 11 Oct
Microsoft's Internet Explorer 6 has long been the bane of every front-end developer's life. It's a 10-year old browser - ...Xfm Buzz - A Radio Hack
1:15p.m., 31 May
At Global Towers we developers have 10% time to go away and hack at something that might, ultimately, bring value ...