diff tests/test-merge1.out @ 2848:e78cad1f6b1f

Merge manifest refactor work
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 15:03:46 -0500
parents b2ae81a7df29
children a31557193f3c
line wrap: on
line diff