tests/test-issue612.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sat, 22 Mar 2008 20:15:30 +0100
changeset 6353 04d615b2d5e9
parent 6336 4b0c9c674707
child 6512 368a4ec603cc
permissions -rw-r--r--
Merge main and crew.

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