comparison contrib/simplemerge @ 13852:f911b1de5fa0 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Apr 2011 13:25:26 -0500
parents bb9f13974d8e
children 659f34b833b9
comparison
equal deleted inserted replaced
13847:b0e9b36dcfbc 13852:f911b1de5fa0