comparison tests/test-merge1.t @ 15758:634404392449 stable 2.0.2

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jan 2012 13:37:30 -0600
parents 1e9451476bf8
children 6c8573dd1b6b
comparison
equal deleted inserted replaced
15750:03d04296cfab 15758:634404392449