view tests/test-merge4.out @ 6610:92b5be854677

Backed out changeset ff5ef3c0fe10 (fixes wrong documentation)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 19 May 2008 10:19: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)