tests/test-issue612.out
author Maxim Dounin <mdounin@mdounin.ru>
Wed, 13 Feb 2008 05:27:04 +0300
changeset 6085 e1f11b8a1e9e
parent 5610 2493a478f395
child 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: disable cgitb by default in hgwebdir.fcgi too

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