view tests/test-merge4.out @ 5286:cbec83d9b0b4

Update test-record for 3ef190234b55
author Brendan Cully <brendan@kublai.com>
date Thu, 06 Sep 2007 18:12:36 -0700
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)