<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
		>
<channel>
	<title>Comments on: Merging and More with diff3</title>
	<atom:link href="http://www.linux-mag.com/id/4133/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.linux-mag.com/id/4133/</link>
	<description>Open Source, Open Standards</description>
	<lastBuildDate>Fri, 10 Feb 2012 10:28:21 +0000</lastBuildDate>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.1</generator>
	<item>
		<title>By: satijar</title>
		<link>http://www.linux-mag.com/id/4133/#comment-4620</link>
		<dc:creator>satijar</dc:creator>
		<pubDate>Tue, 30 Nov 1999 00:00:00 +0000</pubDate>
		<guid isPermaLink="false">http://www.linux-mag.com/id/4133/#comment-4620</guid>
		<description>very good info for linux users/sys administrators</description>
		<content:encoded><![CDATA[<p>very good info for linux users/sys administrators</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: sucool</title>
		<link>http://www.linux-mag.com/id/4133/#comment-4621</link>
		<dc:creator>sucool</dc:creator>
		<pubDate>Tue, 30 Nov 1999 00:00:00 +0000</pubDate>
		<guid isPermaLink="false">http://www.linux-mag.com/id/4133/#comment-4621</guid>
		<description>Excellent information ...thanks.....</description>
		<content:encoded><![CDATA[<p>Excellent information &#8230;thanks&#8230;..</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: avics</title>
		<link>http://www.linux-mag.com/id/4133/#comment-4622</link>
		<dc:creator>avics</dc:creator>
		<pubDate>Tue, 30 Nov 1999 00:00:00 +0000</pubDate>
		<guid isPermaLink="false">http://www.linux-mag.com/id/4133/#comment-4622</guid>
		<description>I&#039;ve doing diff3 like merges with emacs for more than 10 years. It works like a charm, especially since the emacs frontend shows diff&#039;s on a character base as well.</description>
		<content:encoded><![CDATA[<p>I&#8217;ve doing diff3 like merges with emacs for more than 10 years. It works like a charm, especially since the emacs frontend shows diff&#8217;s on a character base as well.</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: 1sy8</title>
		<link>http://www.linux-mag.com/id/4133/#comment-4623</link>
		<dc:creator>1sy8</dc:creator>
		<pubDate>Tue, 30 Nov 1999 00:00:00 +0000</pubDate>
		<guid isPermaLink="false">http://www.linux-mag.com/id/4133/#comment-4623</guid>
		<description>How do you do that in emacs ? Splitting windows maybe ?</description>
		<content:encoded><![CDATA[<p>How do you do that in emacs ? Splitting windows maybe ?</p>
]]></content:encoded>
	</item>
</channel>
</rss>

