diff tests/test-simplemerge.py.out @ 16451:9c431cfdca12

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2012 16:50:25 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff