<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://wiki.animationmaster.com/index.php?action=history&amp;feed=atom&amp;title=KDiff3</id>
	<title>KDiff3 - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://wiki.animationmaster.com/index.php?action=history&amp;feed=atom&amp;title=KDiff3"/>
	<link rel="alternate" type="text/html" href="https://wiki.animationmaster.com/index.php?title=KDiff3&amp;action=history"/>
	<updated>2026-04-30T04:23:16Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.32.0</generator>
	<entry>
		<id>https://wiki.animationmaster.com/index.php?title=KDiff3&amp;diff=376&amp;oldid=prev</id>
		<title>WillP: 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...</title>
		<link rel="alternate" type="text/html" href="https://wiki.animationmaster.com/index.php?title=KDiff3&amp;diff=376&amp;oldid=prev"/>
		<updated>2007-02-13T20:15:51Z</updated>

		<summary type="html">&lt;p&gt;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...&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;&lt;br /&gt;
[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 for resolving [[svn]] conflicts on osx.&lt;br /&gt;
&lt;br /&gt;
[http://prdownloads.sourceforge.net/kdiff3/kdiff3-0.9.88-MacOSX-binary.zip?download KDiff3 download for osx ppc]&lt;br /&gt;
&lt;br /&gt;
[[category:TWO]]&lt;br /&gt;
[[category:SVN]]&lt;/div&gt;</summary>
		<author><name>WillP</name></author>
		
	</entry>
</feed>