diff tests/test-manifest-merging.out @ 4346:c593e502f7fd

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Apr 2007 18:42:38 -0500
parents be8efb6e1cc6
children
line wrap: on
line diff