diff mercurial/ancestor.py @ 24990:015adbcd92f3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 10 May 2015 14:45:13 -0500
parents f710644e1ce9
children 0ca8410ea345
line wrap: on
line diff