diff tests/test-simplemerge.py @ 4379:80c7fa620a4d

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Apr 2007 18:41:18 -0500
parents 2e3c54fb79a3
children 96d8a56d4ef9
line wrap: on
line diff