comparison tests/test-merge7.t @ 13497:45b48be6b910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sat, 26 Feb 2011 10:40:22 -0600
parents 4134686b83e1
children ec5886db9dc6
comparison
equal deleted inserted replaced
13494:3178aca36b0f 13497:45b48be6b910