log tests/test-merge1.out @ 3002:a31557193f3c

age author description
Tue, 22 Aug 2006 17:08:38 -0500 Matt Mackall merge: simplify working dir manifest generation