view tests/test-merge4.out @ 11315:666b62c52767

test-branch-option: Updated output to match rev 3f1409082720
author Jan Sorensen <js@aragost.com>
date Wed, 09 Jun 2010 17:22:59 +0200
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)