comparison tests/test-merge-local.t @ 14812:7ba7459875cb stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Jun 2011 16:05:41 -0500
parents 4134686b83e1
children 2371f4aea665
comparison
equal deleted inserted replaced
14772:2dbce40fcaea 14812:7ba7459875cb