tests/test-issue612.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 19:56:16 -0300
changeset 4866 9858477ed74c
parent 4820 9797124581c9
permissions -rw-r--r--
serve: respect settings from .hg/hgrc create_server was looking only at the root ui object, ignoring any settings from .hg/hgrc. To keep respecting command-line arguments, commands.serve must also call repo.ui.setconfig.

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