diff tests/test-bad-pull @ 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 d22d730c96ed
children 7012c889e8f2
line wrap: on
line diff