tests/test-issue612.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 28 Nov 2007 13:58:31 -0800
changeset 5565 feac5b0bf9ba
parent 4819 9797124581c9
child 5610 2493a478f395
permissions -rw-r--r--
Drop a bad import that snuck in.

adding src/a.c
copying src/a.c to source/a.c
removing src/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