Difference between revisions of "KDiff3"

From Animation Master Wiki
Jump to navigation Jump to search
(New page: [http://kdiff3.sourceforge.net/ 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 f...)
 
(No difference)

Latest revision as of 13:15, 13 February 2007

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