diff tests/test-manifest-merging.out @ 3920:f2c4a2ee59ed

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 16 Dec 2006 14:51:22 -0600
parents be8efb6e1cc6
children
line wrap: on
line diff