diff tests/test-confused-revert.out @ 3002:a31557193f3c

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