Robin Berjon @robinberjon · 10 Jul 2012 Fascinating: hg is seeing a conflict between two revisions that have a null diff. Fuck you too, Mercurial.
