<?xml version="1.0" encoding="UTF-8" ?>
<?xml-stylesheet type="text/xsl" href="http://blogs.msdn.com/utility/FeedStylesheets/rss.xsl" media="screen"?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/" xmlns:wfw="http://wellformedweb.org/CommentAPI/"><channel><title>common diff/merge configuration values</title><link>http://blogs.msdn.com/jmanning/archive/2006/02/20/535591.aspx</link><description>Last week there was some analysis of how various tools did during particular merge operations (especially cherry-pick). I got the word back from one of the people in that effort that my personal favorite 3-way merge tool ( KDiff3 ) did quite horribly.</description><dc:language>en-US</dc:language><generator>CommunityServer 2.1 SP1 (Build: 61025.2)</generator><item><title>VSTS Links - 2/23/2006</title><link>http://blogs.msdn.com/jmanning/archive/2006/02/20/535591.aspx#537876</link><pubDate>Thu, 23 Feb 2006 18:14:58 GMT</pubDate><guid isPermaLink="false">91d46819-8472-40ad-a661-2c78acb4018c:537876</guid><dc:creator>Team System News</dc:creator><description>John Lawrence posts their Team Foundation Dogfood Statistics for February.&lt;br&gt;&lt;br&gt;It's Rob Caron time:&lt;br&gt;...</description></item></channel></rss>