comparison tests/test-merge-remove.t @ 14812:7ba7459875cb stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Jun 2011 16:05:41 -0500
parents 0a63e91c519d
children e4d7cbc94219
comparison
equal deleted inserted replaced
14772:2dbce40fcaea 14812:7ba7459875cb