view tests/test-merge4.out @ 8293:f00573bc93f8

test: change repair strip test to illustrate manifest errors
author Henrik Stuart <henrik.stuart@edlund.dk>
date Mon, 04 May 2009 13:47:12 +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)