tests/test-issue612.out
author Steve Borho <steve@borho.org>
Tue, 18 Sep 2007 19:53:01 -0500
changeset 5469 b12432b1c2c7
parent 4819 9797124581c9
child 5610 2493a478f395
permissions -rw-r--r--
Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.

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