diff tests/test-ancestor.py.out @ 18891:bd6aed2ad5ee

merge with i18n Note: i18n work should normally be done on stable
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Apr 2013 17:57:42 -0500
parents f7f8159caad3
children 731b2a90983b
line wrap: on
line diff