view tests/test-issue612.out @ 5998:5d91f6e6f841

Clarify help for hg status and make it consistent.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 02 Feb 2008 14:49:31 +0100
parents 2493a478f395
children 4b0c9c674707
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
? 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