view tests/test-issue612.out @ 5203:ce4e67533723

add import from url capability
author rupert.thurner@gmail.com
date Mon, 20 Aug 2007 22:02:05 +0200
parents 9797124581c9
children
line wrap: on
line source

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