News for hackers. Stuff that matters.

A comment on Behind enemy lines: 3 months as an iOS developer at Google. Parent comment

Re:Behind enemy lines: 3 months as an iOS developer at Google by chiph on Thursday January 03, 2013 @12:09PM (#5003306)
I've been happy with BeyondCompare. Reasonably priced, does 3-way merges, configurable with many version control systems. Now with Linux & Windows versions (but not a OS X version yet)
[ Parent | on HN ]

There are no comments on this comment yet.