diff tests/test-merge-default @ 4879:da8640113b5a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 13:34:40 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff