diff tests/test-confused-revert.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 6c6c0e5595a2
children 25857e00af8e
line wrap: on
line diff