diff tests/test-ancestor.py @ 24163:bb11081562d7

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Mar 2015 01:20:14 -0600
parents f710644e1ce9
children 4056fdf71aff
line wrap: on
line diff