comparison tests/test-merge-local @ 10860:36cec3184612 stable

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 17:48:00 -0500
parents 46280c004f22
children 4c94b6d0fb1c
comparison
equal deleted inserted replaced
10858:2200d8464fbb 10860:36cec3184612