diff tests/test-up-local-change.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 92a0c2200e41
children 40e777bda455
line wrap: on
line diff