view tests/test-merge4.out @ 4755:47091c8d028e

convert: move *** empty log message *** into commit class
author Brendan Cully <brendan@kublai.com>
date Sun, 01 Jul 2007 19:40:02 -0700
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)