tests/test-issue612.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 13 Apr 2010 23:04:46 +0200
changeset 10899 90112473b8ca
parent 6512 368a4ec603cc
permissions -rw-r--r--
fix test-pull after 468876bc3885

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 to 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