diff tests/test-ancestor.py @ 18535:7068089c95a2

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:48:33 -0600
parents f7f8159caad3
children 2fa303619b4d
line wrap: on
line diff