tests/test-issue612.out
author David Soria Parra <dsp@php.net>
Sat, 06 Dec 2008 16:15:59 +0100
changeset 7482 42cb14f20d76
parent 6512 368a4ec603cc
permissions -rw-r--r--
bookmarks: Fix tests As we merge tags now with bookmarks we have add those tags to the tests.

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