On Wed, Apr 13, 2011 at 08:24:32PM +0200, Georg Brandl wrote:
> > summary:
> > merge from push conflict.
>
> this message is not quite correct -- there is no conflict involved.
> You're just merging two heads on the same branch in order to have
> only one head in the master repo.
Okay, got it.
On 13.04.2011 03:43, senthil.kumaran wrote:
> http://hg.python.org/cpython/rev/a4d1a3e0f7bd
> changeset: 69306:a4d1a3e0f7bd
> parent: 69305:35b16d49c0b1
> parent: 69299:c8d075051e88
> user:Senthil Kumaran
> date:Wed Apr 13 09:38:51 2011 +0800
> summary:
> merge from p
