view tests/test-merge4.out @ 7037:e3f9feb9ab7e

update: mention null revision in help text
author Martin Geisler <mg@daimi.au.dk>
date Wed, 17 Sep 2008 10:24:30 +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)