diff tests/test-merge-revert2.t @ 18531:8caf566f4910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:23:37 -0600
parents 2371f4aea665
children 25d5a9ecbb85
line wrap: on
line diff