KDiff3 is a diff/merge tool that takes a text file that two people started from and their changes and merges each persons changes into one file. Usefull for resolving svn conflicts on osx.
KDiff3 download for osx ppc
