Commits

Oben Sonne  committed 790acf9

Site update

  • Participants
  • Parent commits 86e4a85

Comments (0)

Files changed (2)

File blog/20110315-what-the-merge.html

 
 <p><em>Analyze merges in Mercurial to see what a colleague did with your changes</em></p>
 <h2>We all love merging</h2>
-<p>A great feature of a <a href="http://en.wikipedia.org/w/index.php?title=Distributed_Version_Control_System">DVCS</a> like <a href="http://obensonne.bitbucket.org/mercurial.selenic.com">Mercurial</a> is that it makes merging
+<p>A great feature of a <a href="http://en.wikipedia.org/w/index.php?title=Distributed_Version_Control_System">DVCS</a> like <a href="http://mercurial.selenic.com">Mercurial</a> is that it makes merging
 concurrent lines of development so easy. Indeed merges occur quite often
 because the local workflow of a DVCS motivates to commit often and to deal with
 the synchronization of changes from coworkers at a later time, when you're done
 <link>http://obensonne.bitbucket.org/blog.html</link>
 <description>My name is dragonforce. You killed my dragons. Prepare to scream.</description>
 <language>en-us</language>
-<pubDate>Wed, 29 Jun 2011 20:42:29 -0000</pubDate>
-<lastBuildDate>Wed, 29 Jun 2011 20:42:29 -0000</lastBuildDate>
+<pubDate>Wed, 29 Jun 2011 20:46:39 -0000</pubDate>
+<lastBuildDate>Wed, 29 Jun 2011 20:46:39 -0000</lastBuildDate>
 <docs>http://blogs.law.harvard.edu/tech/rss</docs>
 <generator>Poole</generator>