comparison tests/test-simplemerge.py.out @ 9982:ddc899096b7b

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Dec 2009 14:37:33 -0600
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
9980:2ba40cdaacb2 9982:ddc899096b7b