Category: SVN 2010 SVN merge conflict fffffffuuuuuuuuuuuu comic Nov 17 2010 Very nice video about DVCS - Kiln - Mercurial Nov 16 2010