comparison tests/test-merge5.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 49988d9f0758
children 41989e55fa37
comparison
equal deleted inserted replaced
3003:cbb90f4bafb0 3004:31011730f9bd