tests/test-issue612.out
author Martin Geisler <mg@lazybytes.net>
Wed, 18 Aug 2010 11:59:35 +0200
changeset 11959 be33381882ad
parent 6512 368a4ec603cc
permissions -rw-r--r--
test-subrepo-paths: moved comment lines to where they belong

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