comparison tests/test-merge-remove.t @ 13491:9c5aae633d5f stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 25 Feb 2011 15:35:01 -0600
parents 0a63e91c519d
children e4d7cbc94219
comparison
equal deleted inserted replaced
13481:4eb1e9d6a7c9 13491:9c5aae633d5f