view tests/test-merge4.out @ 4176:fc12ac3755d5

Test update to branch tip
author Brendan Cully <brendan@kublai.com>
date Sat, 10 Mar 2007 17:36:29 -0800
parents b2ae81a7df29
children
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)