diff tests/test-simplemerge.py @ 5441:f9c2917a9f7a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Tue, 09 Oct 2007 17:25:24 -0500
parents ff7253a0d1da
children
line wrap: on
line diff