diff tests/test-ancestor.py @ 23394:b5e2128ce9e6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Nov 2014 17:30:05 -0600
parents f710644e1ce9
children 4056fdf71aff
line wrap: on
line diff