tests/test-issue612.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 15 Feb 2008 16:06:36 -0200
changeset 6120 f89878df40fe
parent 5610 2493a478f395
child 6336 4b0c9c674707
permissions -rw-r--r--
move the reading of branch.cache from _branchtags to branchtags

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