diff tests/test-manifest-merging.out @ 4879:da8640113b5a

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