<?xml version="1.0" encoding="UTF-8"?><!-- generator="wordpress/2.0.11" -->
<rss version="2.0" 
	xmlns:content="http://purl.org/rss/1.0/modules/content/">
<channel>
	<title>Comments on: Merging and More with diff3</title>
	<link>http://www.linux-mag.com/id/4133/</link>
	<description>Open Source, Open Standards</description>
	<pubDate>Sun, 23 Nov 2008 11:13:31 +0000</pubDate>
	<generator>http://wordpress.org/?v=2.0.11</generator>

	<item>
		<title>by: Iray Valo</title>
		<link>http://www.linux-mag.com/id/4133/#comment-458</link>
		<pubDate>Mon, 01 Oct 2007 08:12:41 +0000</pubDate>
		<guid>http://www.linux-mag.com/id/4133/#comment-458</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>
	<item>
		<title>by: avics</title>
		<link>http://www.linux-mag.com/id/4133/#comment-457</link>
		<pubDate>Sun, 30 Sep 2007 05:39:56 +0000</pubDate>
		<guid>http://www.linux-mag.com/id/4133/#comment-457</guid>
					<description>I've doing diff3 like merges with emacs for more than 10 years. It works like a charm, especially since the emacs frontend shows diff'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: sucool</title>
		<link>http://www.linux-mag.com/id/4133/#comment-456</link>
		<pubDate>Fri, 28 Sep 2007 07:25:15 +0000</pubDate>
		<guid>http://www.linux-mag.com/id/4133/#comment-456</guid>
					<description>Excellent information ...thanks.....</description>
		<content:encoded><![CDATA[<p>Excellent information &#8230;thanks&#8230;..
</p>
]]></content:encoded>
				</item>
	<item>
		<title>by: satijar</title>
		<link>http://www.linux-mag.com/id/4133/#comment-455</link>
		<pubDate>Fri, 28 Sep 2007 04:28:08 +0000</pubDate>
		<guid>http://www.linux-mag.com/id/4133/#comment-455</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>
</channel>
</rss>
