diff tests/test-simplemerge.py @ 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 f18830651811
children 56b2bcea2529
line wrap: on
line diff