diff tests/test-merge2 @ 4209:dbc3846c09a1

Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents 9dcf9d45cab8
children
line wrap: on
line diff