diff mercurial/ancestor.py @ 24775:36993b52d016

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 17:30:01 -0500
parents f710644e1ce9
children 0ca8410ea345
line wrap: on
line diff