diff tests/test-merge5 @ 3002:a31557193f3c

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