tests/test-issue612.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 22 Apr 2009 01:53:15 +0200
changeset 8107 0eeb4f0a5d21
parent 6512 368a4ec603cc
permissions -rw-r--r--
run-tests: fix -jN broken by 60a9e3cf0cf4

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