diff tests/test-simplemerge.py.out @ 21220:b04a2f49cb55

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 May 2014 19:24:03 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff