comparison tests/test-merge4.t @ 23050:7f8d16af8cae stable 3.2-rc

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:05:10 -0500
parents 63c817ea4a70
children 8561ad49915d
comparison
equal deleted inserted replaced
23048:ee5f834077be 23050:7f8d16af8cae