comparison tests/test-simplemerge.py @ 18578:7511d4df752e stable 2.5.1

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Feb 2013 22:58:58 +0000
parents d08b333816c6
children f18830651811
comparison
equal deleted inserted replaced
18568:cd403d6d96ef 18578:7511d4df752e