diff tests/test-merge-default @ 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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff