New changeset (stable) in mercurial: http://selenic.com/repo/hg//rev/1ce131b3221e changeset: 21167:1ce131b3221e branch: stable tag: tip user: Matt Mackall <mpm at selenic.com> date: Mon Apr 21 15:08:39 2014 -0500 summary: merge: fix test failures with new merge code on OS X -- Repository URL: http://selenic.com/repo/hg/