diff tests/test-simplemerge.py.out @ 13846:542fa0290298 stable

Added tag 1.8.2 for changeset b032bec2c0a6
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Apr 2011 12:41:56 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff