diff mercurial/ancestor.py @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents 64911a12dc28
children baecf4e1b7d0
line wrap: on
line diff