Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge6 @ 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 | e506c14382fd |
children | ad3d5b4367cb |