diff tests/test-merge-default.out @ 2973:a31557193f3c

merge: simplify working dir manifest generation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:08:38 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff