view tests/test-merge4.out @ 8523:5b7da468531b

tests: replace #...# syntax with {...}
author Martin Geisler <mg@lazybytes.net>
date Tue, 19 May 2009 23:02:17 +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)