view tests/test-issue612.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 368a4ec603cc
line wrap: on
line source

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o