view tests/test-simplemerge.py.out @ 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
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK