diff tests/test-confused-revert.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 6c6c0e5595a2
children 25857e00af8e
line wrap: on
line diff