diff tests/test-commit.out @ 3004:31011730f9bd

merge: eliminate mw manifestdict, do everything with m1
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:26:44 -0500
parents ef53d200df3d
children c9cd63a6fce9
line wrap: on
line diff