diff tests/test-merge-revert2.out @ 3097:1b738357bba9

merge: fold umap and added into m1 manifest
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 21:02:25 -0500
parents b2ae81a7df29
children ad6f34c83c3d
line wrap: on
line diff