view tests/test-merge4.out @ 8959:970506870efb

Update test output for e67e5b60e55f
author Brendan Cully <brendan@kublai.com>
date Mon, 29 Jun 2009 09:00:26 -0700
parents 4b0c9c674707
children
line wrap: on
line source

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