view tests/test-merge4.out @ 11355:9011036ba79d

relink/progress: Adding progress for collecting stage
author timeless <timeless@gmail.com>
date Thu, 10 Jun 2010 15:35:06 +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)