diff tests/test-merge-revert2.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 b2ae81a7df29
children ad6f34c83c3d
line wrap: on
line diff