view tests/test-merge4.out @ 2839:b4f05ecf4ee8

Switch to simpler manifestdict
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Aug 2006 22:38:56 -0500
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)