diff tests/test-up-local-change.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 a31557193f3c
children 87a0332ab58b
line wrap: on
line diff