tests/test-mq-merge.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 19:56:16 -0300
changeset 4866 9858477ed74c
parent 4437 a210b40d0860
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 a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty