[pypy-svn] pypy commit 31c498ed04be: hg --config ui.merge=internal:local merge 90600b6d6a68

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Hakan Ardo <hakan at debian.org>
# Date 1292443616 -3600
# Node ID 31c498ed04be76444c28579a2bec330689953577
# Parent  d1731fe45643396e26dd1b007b657921e355d870
# Parent  90600b6d6a689b7e6c9710bd13c06949381f2094
hg --config ui.merge=internal:local merge 90600b6d6a68