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